From 4b95b0bbe27a0e3416036bde6e65c92b8ed36702 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 28 Mar 2020 11:31:52 -0700
Subject: [PATCH 001/262] Version 0.8 starts.

---
 .idea/mobibot.iml                             |    2 +-
 .idea/modules/mobibot.main.iml                |    2 +-
 .idea/modules/mobibot.test.iml                |    4 +-
 build.gradle                                  |    4 +-
 config/spotbugs/excludeFilter.xml             |    7 +-
 detekt-baseline.xml                           |   52 +-
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |   12 +-
 .../net/thauvin/erik/mobibot/Commands.java    |  149 --
 .../net/thauvin/erik/mobibot/Constants.java   |   38 +-
 .../net/thauvin/erik/mobibot/Mobibot.java     | 1268 +++++------------
 .../net/thauvin/erik/mobibot/TwitterTimer.kt  |    2 +-
 .../java/net/thauvin/erik/mobibot/Utils.java  |   10 +
 .../erik/mobibot/commands/AbstractCommand.kt  |   67 +
 .../thauvin/erik/mobibot/commands/Cycle.kt    |   68 +
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  111 ++
 .../net/thauvin/erik/mobibot/commands/Info.kt |   92 ++
 .../net/thauvin/erik/mobibot/commands/Me.kt   |   62 +
 .../erik/mobibot/commands/MobibotVersion.kt   |   64 +
 .../thauvin/erik/mobibot/commands/Modules.kt  |   68 +
 .../net/thauvin/erik/mobibot/commands/Msg.kt  |   67 +
 .../net/thauvin/erik/mobibot/commands/Nick.kt |   62 +
 .../thauvin/erik/mobibot/commands/Recap.kt    |   95 ++
 .../net/thauvin/erik/mobibot/commands/Say.kt  |   63 +
 .../thauvin/erik/mobibot/commands/Users.kt    |   71 +
 .../erik/mobibot/commands/links/Comment.kt    |  130 ++
 .../erik/mobibot/commands/links/Posting.kt    |  147 ++
 .../erik/mobibot/commands/links/Tags.kt       |   92 ++
 .../erik/mobibot/commands/links/UrlMgr.kt     |  243 ++++
 .../erik/mobibot/commands/links/View.kt       |  130 ++
 .../mobibot/{ => commands}/tell/Tell.java     |  104 +-
 .../{ => commands}/tell/TellMessage.java      |    2 +-
 .../{ => commands}/tell/TellMessagesMgr.java  |    2 +-
 .../erik/mobibot/entries/EntriesUtils.java    |   11 +-
 .../erik/mobibot/modules/AbstractModule.java  |    2 +-
 .../thauvin/erik/mobibot/modules/Calc.java    |    8 +-
 .../mobibot/modules/CurrencyConverter.java    |   14 +-
 .../thauvin/erik/mobibot/modules/Dice.java    |   12 +-
 .../erik/mobibot/modules/GoogleSearch.java    |  128 +-
 .../thauvin/erik/mobibot/modules/Joke.java    |    6 +-
 .../thauvin/erik/mobibot/modules/Lookup.java  |    7 +-
 .../thauvin/erik/mobibot/modules/Ping.java    |    7 +-
 .../erik/mobibot/modules/RockPaperScissors.kt |   17 +-
 .../erik/mobibot/modules/StockQuote.java      |   34 +-
 .../thauvin/erik/mobibot/modules/Twitter.java |    7 +-
 .../net/thauvin/erik/mobibot/modules/War.java |   12 +-
 .../erik/mobibot/modules/Weather2.java        |   22 +-
 .../erik/mobibot/modules/WorldTime.java       |   11 +-
 .../{ => commands}/tell/TellMessageTest.java  |    2 +-
 version.properties                            |   12 +-
 49 files changed, 2284 insertions(+), 1318 deletions(-)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/Commands.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
 rename src/main/java/net/thauvin/erik/mobibot/{ => commands}/tell/Tell.java (75%)
 rename src/main/java/net/thauvin/erik/mobibot/{ => commands}/tell/TellMessage.java (99%)
 rename src/main/java/net/thauvin/erik/mobibot/{ => commands}/tell/TellMessagesMgr.java (99%)
 rename src/test/java/net/thauvin/erik/mobibot/{ => commands}/tell/TellMessageTest.java (98%)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 1b43317..7b66ece 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.7.3-beta+739" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+033" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_14" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 294ae5d..49a5e9b 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.7.3-beta+739" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+033" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 75edcff..b92cc97 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.7.3-beta+739" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+033" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.9/122c7cee69b53ed4a7681c03d4ee4c0e2765da5/commons-lang3-3.9.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.9/122c7cee69b53ed4a7681c03d4ee4c0e2765da5/commons-lang3-3.9.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
diff --git a/build.gradle b/build.gradle
index 50b3de9..d9102a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -88,7 +88,7 @@ spotbugs {
 
 tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
     reports {
-        xml.enabled = false
+        xml.enabled = true
         html.enabled = true
     }
     excludeFilter.set(file("$projectDir/config/spotbugs/excludeFilter.xml"))
@@ -140,7 +140,7 @@ clean {
 }
 
 run {
-    args '--v'
+    //args '--v'
 }
 
 incrementBuildMeta {
diff --git a/config/spotbugs/excludeFilter.xml b/config/spotbugs/excludeFilter.xml
index 3d88834..49bdd81 100644
--- a/config/spotbugs/excludeFilter.xml
+++ b/config/spotbugs/excludeFilter.xml
@@ -6,7 +6,7 @@
     <Match>
         <Or>
             <Package name="net.thauvin.erik.mobibot.*"/>
-            <Package name="net.thauvin.erik.mobibot.tell.*"/>
+            <Package name="net.thauvin.erik.mobibot.commands.tell.*"/>
             <Package name="net.thauvin.erik.mobibot.entries.*"/>
         </Or>
         <Or>
@@ -21,7 +21,7 @@
             <Class name="net.thauvin.erik.mobibot.Mobibot"/>
             <Class name="net.thauvin.erik.mobibot.Pinboard"/>
             <Class name="net.thauvin.erik.mobibot.FeedReader"/>
-            <Class name="net.thauvin.erik.mobibot.tell.Tell"/>
+            <Class name="net.thauvin.erik.mobibot.commands.tell.Tell"/>
             <Package name="net.thauvin.erik.mobibot.modules.*"/>
             <Package name="net.thauvin.erik.mobibot.entries.*"/>
         </Or>
@@ -33,4 +33,7 @@
         <Bug pattern="PATH_TRAVERSAL_OUT"/>
         <Confidence value="1"/>
     </Match>
+    <Match>
+        <Source name="~.*\.kt"/>
+    </Match>
 </FindBugsFilter>
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index fee5cbc..2f5da4b 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -1,37 +1,23 @@
 <?xml version="1.0" ?>
-<!--
-  ~ detekt-baseline.xml
-  ~
-  ~ Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
-  ~ All rights reserved.
-  ~
-  ~ Redistribution and use in source and binary forms, with or without
-  ~ modification, are permitted provided that the following conditions are met:
-  ~
-  ~   Redistributions of source code must retain the above copyright notice, this
-  ~   list of conditions and the following disclaimer.
-  ~
-  ~   Redistributions in binary form must reproduce the above copyright notice,
-  ~   this list of conditions and the following disclaimer in the documentation
-  ~   and/or other materials provided with the distribution.
-  ~
-  ~   Neither the name of this project nor the names of its contributors may be
-  ~   used to endorse or promote products derived from this software without
-  ~   specific prior written permission.
-  ~
-  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  ~ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  ~ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  ~ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  ~ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  ~ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  ~ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  ~ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  ~ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  -->
-
 <SmellBaseline>
   <Blacklist></Blacklist>
-  <Whitelist></Whitelist>
+  <Whitelist>
+    <ID>ComplexMethod:Links.kt$Links$commandResponse</ID>
+    <ID>ComplexMethod:UrlMgr.kt$UrlMgr$commandResponse</ID>
+    <ID>ComplexMethod:View.kt$View$commandResponse</ID>
+    <ID>LongMethod:Links.kt$Links$commandResponse</ID>
+    <ID>LongMethod:UrlMgr.kt$UrlMgr$commandResponse</ID>
+    <ID>LongMethod:View.kt$View$commandResponse</ID>
+    <ID>LongParameterList:AbstractCommand.kt$AbstractCommand$( bot: Mobibot, sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
+    <ID>LoopWithTooManyJumpStatements:View.kt$View$while (i &lt; max) { entry = getEntry(i) if (lcArgs.isNotEmpty()) { if (entry.link.toLowerCase().contains(lcArgs) || entry.title.toLowerCase().contains(lcArgs) || entry.nick.toLowerCase().contains(lcArgs)) { if (sent &gt; maxEntries) { bot.send( sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs"), isPrivate ) break } bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate) sent++ } } else { if (sent &gt; maxEntries) { bot.send( sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1}"), isPrivate ) break } bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate) sent++ } i++ }</ID>
+    <ID>MagicNumber:Comments.kt$Comments$3</ID>
+    <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
+    <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
+    <ID>MagicNumber:View.kt$View$8</ID>
+    <ID>NestedBlockDepth:Comments.kt$Comments$commandResponse</ID>
+    <ID>NestedBlockDepth:Ignore.kt$Ignore$commandResponse</ID>
+    <ID>NestedBlockDepth:Links.kt$Links$commandResponse</ID>
+    <ID>NestedBlockDepth:UrlMgr.kt$UrlMgr$commandResponse</ID>
+    <ID>NestedBlockDepth:View.kt$View$commandResponse</ID>
+  </Whitelist>
 </SmellBaseline>
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 0653d4b..3421c5d 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1585119580379L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1585416159853L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
-    public static final int MINOR = 7;
-    public static final int PATCH = 3;
-    public static final String PRERELEASE = "beta";
-    public static final String BUILDMETA = "760";
-    public static final String VERSION = "0.7.3-beta+760";
+    public static final int MINOR = 8;
+    public static final int PATCH = 0;
+    public static final String PRERELEASE = "alpha";
+    public static final String BUILDMETA = "045";
+    public static final String VERSION = "0.8.0-alpha+045";
 
     /**
      * Disables the default constructor.
diff --git a/src/main/java/net/thauvin/erik/mobibot/Commands.java b/src/main/java/net/thauvin/erik/mobibot/Commands.java
deleted file mode 100644
index 7bcdf43..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/Commands.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Commands.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot;
-
-/**
- * The <code>commands</code>, <code>keywords</code> and <code>arguments</code>.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-26
- * @since 1.0
- */
-public final class Commands {
-    /**
-     * The link command.
-     */
-    public static final String LINK_CMD = "L";
-    /**
-     * The view command.
-     */
-    public static final String VIEW_CMD = "view";
-    /**
-     * The add (back)log command.
-     */
-    static final String ADDLOG_CMD = "addlog";
-    /**
-     * The cycle command.
-     */
-    static final String CYCLE_CMD = "cycle";
-    /**
-     * Debug command line argument.
-     */
-    static final String DEBUG_ARG = "debug";
-    /**
-     * The debug command.
-     */
-    static final String DEBUG_CMD = "debug";
-    /**
-     * The die command.
-     */
-    static final String DIE_CMD = "die";
-    /**
-     * Help command line argument.
-     */
-    static final String HELP_ARG = "help";
-    /**
-     * The help command.
-     */
-    static final String HELP_CMD = "help";
-    /**
-     * The help on posting keyword.
-     */
-    static final String HELP_POSTING_KEYWORD = "posting";
-    /**
-     * The help on tags keyword.
-     */
-    static final String HELP_TAGS_KEYWORD = "tags";
-    /**
-     * The ignore command.
-     */
-    static final String IGNORE_CMD = "ignore";
-    /**
-     * The ignore <code>me</code> keyword.
-     */
-    static final String IGNORE_ME_KEYWORD = "me";
-    /**
-     * The info command.
-     */
-    static final String INFO_CMD = "info";
-    /**
-     * The me command.
-     */
-    static final String ME_CMD = "me";
-    /**
-     * The modules command.
-     */
-    static final String MODULES_CMD = "modules";
-    /**
-     * The msg command.
-     */
-    static final String MSG_CMD = "msg";
-    /**
-     * The nick command.
-     */
-    static final String NICK_CMD = "nick";
-    /**
-     * Properties command line argument.
-     */
-    static final String PROPS_ARG = "properties";
-    /**
-     * The recap command.
-     */
-    static final String RECAP_CMD = "recap";
-    /**
-     * The say command.
-     */
-    static final String SAY_CMD = "say";
-    /**
-     * The users command.
-     */
-    static final String USERS_CMD = "users";
-    /**
-     * Properties version line argument.
-     */
-    static final String VERSION_ARG = "version";
-    /**
-     * The version command.
-     */
-    static final String VERSION_CMD = "version";
-
-
-    /**
-     * Disables the default constructor.
-     *
-     * @throws UnsupportedOperationException If the constructor is called.
-     */
-    private Commands() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.java b/src/main/java/net/thauvin/erik/mobibot/Constants.java
index dd2cbaa..411c688 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.java
@@ -1,7 +1,7 @@
 /*
  * Constants.java
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,10 +42,38 @@ import java.util.Locale;
  * @since 1.0
  */
 public final class Constants {
+    /**
+     * The add (back)log command.
+     */
+    public static final String ADDLOG_CMD = "addlog";
     /**
      * The connect/read timeout in ms.
      */
     public static final int CONNECT_TIMEOUT = 5000;
+    /**
+     * Debug command line argument.
+     */
+    public static final String DEBUG_ARG = "debug";
+    /**
+     * The debug command.
+     */
+    public static final String DEBUG_CMD = "debug";
+    /**
+     * The die command.
+     */
+    public static final String DIE_CMD = "die";
+    /**
+     * Help command line argument.
+     */
+    public static final String HELP_ARG = "help";
+    /**
+     * The help command.
+     */
+    public static final String HELP_CMD = "help";
+    /**
+     * The link command.
+     */
+    public static final String LINK_CMD = "L";
     /**
      * Default locale.
      */
@@ -54,6 +82,10 @@ public final class Constants {
      * The empty title string.
      */
     public static final String NO_TITLE = "No Title";
+    /**
+     * Properties command line argument.
+     */
+    public static final String PROPS_ARG = "properties";
     /**
      * The timer delay in minutes.
      */
@@ -66,6 +98,10 @@ public final class Constants {
      * The Twitter handle property key.
      */
     public static final String TWITTER_HANDLE_PROP = "twitter-handle";
+    /**
+     * Properties version line argument.
+     */
+    public static final String VERSION_ARG = "version";
 
     /**
      * Disables the default constructor.
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 3db3c42..e695d4d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -32,11 +32,26 @@
 
 package net.thauvin.erik.mobibot;
 
-import com.rometools.rome.io.FeedException;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.thauvin.erik.mobibot.commands.AbstractCommand;
+import net.thauvin.erik.mobibot.commands.Cycle;
+import net.thauvin.erik.mobibot.commands.Ignore;
+import net.thauvin.erik.mobibot.commands.Info;
+import net.thauvin.erik.mobibot.commands.Me;
+import net.thauvin.erik.mobibot.commands.MobibotVersion;
+import net.thauvin.erik.mobibot.commands.Modules;
+import net.thauvin.erik.mobibot.commands.Msg;
+import net.thauvin.erik.mobibot.commands.Nick;
+import net.thauvin.erik.mobibot.commands.Recap;
+import net.thauvin.erik.mobibot.commands.Say;
+import net.thauvin.erik.mobibot.commands.Users;
+import net.thauvin.erik.mobibot.commands.links.Comment;
+import net.thauvin.erik.mobibot.commands.links.Posting;
+import net.thauvin.erik.mobibot.commands.links.Tags;
+import net.thauvin.erik.mobibot.commands.links.UrlMgr;
+import net.thauvin.erik.mobibot.commands.links.View;
+import net.thauvin.erik.mobibot.commands.tell.Tell;
 import net.thauvin.erik.mobibot.entries.EntriesMgr;
-import net.thauvin.erik.mobibot.entries.EntriesUtils;
-import net.thauvin.erik.mobibot.entries.EntryComment;
 import net.thauvin.erik.mobibot.entries.EntryLink;
 import net.thauvin.erik.mobibot.modules.AbstractModule;
 import net.thauvin.erik.mobibot.modules.Calc;
@@ -54,7 +69,6 @@ import net.thauvin.erik.mobibot.modules.War;
 import net.thauvin.erik.mobibot.modules.Weather2;
 import net.thauvin.erik.mobibot.modules.WorldTime;
 import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.tell.Tell;
 import net.thauvin.erik.semver.Version;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -63,15 +77,13 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.Configurator;
-import org.jibble.pircbot.Colors;
 import org.jibble.pircbot.PircBot;
 import org.jibble.pircbot.User;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -79,22 +91,16 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
-import java.lang.management.ManagementFactory;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.time.Clock;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
-import java.util.StringTokenizer;
 import java.util.Timer;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 /**
@@ -108,52 +114,44 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
 @Version(properties = "version.properties",
          className = "ReleaseInfo")
 public class Mobibot extends PircBot {
-
+    // Info strings
+    @SuppressWarnings("indentation")
+    public static final List<String> INFO =
+            List.of(ReleaseInfo.PROJECT + " v" + ReleaseInfo.VERSION + " by Erik C. Thauvin (erik@thauvin.net)",
+                    "https://www.mobitopia.org/mobibot/");
+    // Version strings
+    @SuppressWarnings("indentation")
+    public static final List<String> MOBIBOT_VERSIONS =
+            List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
+                    "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
+                    + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
+                    "Runtime: " + System.getProperty("java.runtime.name") + " (build " + System.getProperty(
+                            "java.runtime.version") + ')',
+                    "VM: " + System.getProperty("java.vm.name") + " (build " + System.getProperty("java.vm.version")
+                    + ", "
+                    + System.getProperty("java.vm.info") + ')');
+    // Timer
+    public static final Timer timer = new Timer(true);
     // Default port
     private static final int DEFAULT_PORT = 6667;
     // Default server
     private static final String DEFAULT_SERVER = "irc.freenode.net";
-    // Info strings
-    @SuppressWarnings("indentation")
-    private static final String[] INFO_STRS = {
-            ReleaseInfo.PROJECT + " v" + ReleaseInfo.VERSION + " by Erik C. Thauvin (erik@thauvin.net)",
-            "https://www.mobitopia.org/mobibot/" };
-    // Link match string
-    private static final String LINK_MATCH = "^[hH][tT][tT][pP](|[sS])://.*";
-    // Default maximum number of entries to display
-    private static final int MAX_ENTRIES = 8;
-    // Default maximum recap entries
-    private static final int MAX_RECAP = 10;
     // Maximum number of times the bot will try to reconnect, if disconnected
     private static final int MAX_RECONNECT = 10;
     // Number of milliseconds to delay between consecutive messages
     private static final long MESSAGE_DELAY = 1000L;
-    // Modules
-    private static final List<AbstractModule> MODULES = new ArrayList<>(0);
-    // Tags/categories marker
-    private static final String TAGS_MARKER = "tags:";
-    // Version strings
-    @SuppressWarnings("indentation")
-    private static final String[] VERSION_STRS =
-            { "Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
-              "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
-              + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
-              "Runtime: " + System.getProperty("java.runtime.name") + " (build " + System.getProperty(
-                      "java.runtime.version") + ')',
-              "VM: " + System.getProperty("java.vm.name") + " (build " + System.getProperty("java.vm.version") + ", "
-              + System.getProperty("java.vm.info") + ')' };
     // Logger
     private static final Logger logger = LogManager.getLogger(Mobibot.class);
-    // Timer
-    private static final Timer timer = new Timer(true);
-    // Commands list
-    private final List<String> commandsList = new ArrayList<>();
-    // Entries array
-    private final List<EntryLink> entries = new ArrayList<>(0);
-    // History/backlogs array
-    private final List<String> history = new ArrayList<>(0);
-    // Ignored nicks array
-    private final Set<String> ignoredNicks = new HashSet<>(0);
+    // Ignore command
+    public final Ignore ignoreCommand;
+    // Automatically post links to Twitter
+    public final boolean isTwitterAutoPost;
+    // Tell object
+    public final Tell tell;
+    // Commands
+    private final List<AbstractCommand> commands = new ArrayList<>();
+    // Commands Names
+    private final List<String> commandsNames = new ArrayList<>();
     // Main channel
     private final String ircChannel;
     // IRC port
@@ -164,24 +162,22 @@ public class Mobibot extends PircBot {
     private final Level loggerLevel;
     // Log directory
     private final String logsDir;
-    // Recap array
-    private final List<String> recap = new ArrayList<>(0);
-    // Tags keywords matches
-    private final List<String> tagsKeywords = new ArrayList<>();
-    // Tell object
-    private final Tell tell;
-    // The Twitter auto-posts list.
-    private final List<Integer> twitterAutoLinks = new ArrayList<>();
-    // Automatically post links to Twitter
-    private final boolean twitterAutoPost;
+    // Modules
+    private final List<AbstractModule> modules = new ArrayList<>(0);
+    // Modules
+    private final List<String> modulesNames = new ArrayList<>(0);
+    // Operators commands names
+    private final List<String> opsCommandsNames = new ArrayList<>();
+    // Today's date
+    private final String today = Utils.today();
+    // Twitter auto-posts.
+    private final Set<Integer> twitterEntries = new HashSet<>();
     // Twitter handle for channel join notifications
     private final String twitterHandle;
     // Twitter module
     private final Twitter twitterModule;
     // Backlogs URL
     private String backLogsUrl = "";
-    // Default tags/categories
-    private String defaultTags = "";
     // Feed URL
     private String feedUrl = "";
     // Ident message
@@ -192,8 +188,6 @@ public class Mobibot extends PircBot {
     private String identPwd = "";
     // Pinboard posts handler
     private Pinboard pinboard;
-    // Today's date
-    private String today = Utils.today();
     // Weblog URL
     private String weblogUrl = "";
 
@@ -222,34 +216,16 @@ public class Mobibot extends PircBot {
         // Set the logger level
         loggerLevel = logger.getLevel();
 
-        // Load the current entries, if any
+        // Load the current entries and backlogs, if any
         try {
-            today = EntriesMgr.loadEntries(logsDir + EntriesMgr.CURRENT_XML, ircChannel, entries);
+            UrlMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, ircChannel);
 
             if (logger.isDebugEnabled()) {
-                logger.debug("Last feed: {}", today);
+                logger.debug("Last feed: {}", UrlMgr.getToday());
             }
-
-            if (!Utils.today().equals(today)) {
-                entries.clear();
-                today = Utils.today();
-            }
-        } catch (IOException ignore) {
-            // Do nothing
-        } catch (FeedException e) {
+        } catch (Exception e) {
             if (logger.isErrorEnabled()) {
-                logger.error("An error occurred while parsing the '" + EntriesMgr.CURRENT_XML + "' file.", e);
-            }
-        }
-
-        // Load the backlogs, if any
-        try {
-            EntriesMgr.loadBacklogs(logsDir + EntriesMgr.NAV_XML, history);
-        } catch (IOException ignore) {
-            // Do nothing
-        } catch (FeedException e) {
-            if (logger.isErrorEnabled()) {
-                logger.error("An error occurred while parsing the '" + EntriesMgr.NAV_XML + "' file.", e);
+                logger.error("An error occurred while loading the logs.", e);
             }
         }
 
@@ -269,28 +245,53 @@ public class Mobibot extends PircBot {
         // Set the pinboard authentication
         setPinboardAuth(p.getProperty("pinboard-api-token"));
 
+        // Set the ignored nicks
+        ignoreCommand = new Ignore(p.getProperty("ignore", ""));
+
+        // Load the commands
+        commands.add(new Cycle());
+        commands.add(ignoreCommand);
+        commands.add(new Info());
+        commands.add(new Me());
+        commands.add(new MobibotVersion());
+        commands.add(new Modules());
+        commands.add(new Msg());
+        commands.add(new Nick());
+        commands.add(new Recap());
+        commands.add(new Say());
+        commands.add(new Users());
+
+        // Load the links commands
+        commands.add(new Comment());
+        commands.add(new Posting());
+        commands.add(new Tags());
+        commands.add(new UrlMgr(p.getProperty("tags", ""), p.getProperty("tags-keywords", "")));
+        commands.add(new View());
+
+
         // Load the modules
-        MODULES.add(new Calc());
-        MODULES.add(new CurrencyConverter());
-        MODULES.add(new Dice());
-        MODULES.add(new GoogleSearch());
-        MODULES.add(new Joke());
-        MODULES.add(new Lookup());
-        MODULES.add(new Ping());
-        MODULES.add(new RockPaperScissors());
-        MODULES.add(new StockQuote());
+        addModule(new Calc());
+        addModule(new CurrencyConverter());
+        addModule(new Dice());
+        addModule(new GoogleSearch());
+        addModule(new Joke());
+        addModule(new Lookup());
+        addModule(new Ping());
+        addModule(new RockPaperScissors());
+        addModule(new StockQuote());
 
         twitterModule = new Twitter();
-        MODULES.add(twitterModule);
+        addModule(twitterModule);
         twitterHandle = p.getProperty(Constants.TWITTER_HANDLE_PROP, "");
-        twitterAutoPost = Boolean.parseBoolean(p.getProperty(Constants.TWITTER_AUTOPOST_PROP, "false"));
-
-        MODULES.add(new War());
-        MODULES.add(new Weather2());
-        MODULES.add(new WorldTime());
+        isTwitterAutoPost =
+                Boolean.parseBoolean(p.getProperty(Constants.TWITTER_AUTOPOST_PROP, "false"))
+                && twitterModule.isEnabled();
+        addModule(new War());
+        addModule(new Weather2());
+        addModule(new WorldTime());
 
         // Load the modules properties
-        MODULES.stream().filter(AbstractModule::hasProperties).forEach(module -> {
+        modules.stream().filter(AbstractModule::hasProperties).forEach(module -> {
             for (final String s : module.getPropertyKeys()) {
                 module.setProperty(s, p.getProperty(s, ""));
             }
@@ -299,15 +300,8 @@ public class Mobibot extends PircBot {
         // Get the tell command settings
         tell = new Tell(this, p.getProperty("tell-max-days"), p.getProperty("tell-max-size"));
 
-        // Set the tags
-        setTags(p.getProperty("tags", ""));
-        setTagsKeywords(p.getProperty("tags-keywords", ""));
-
-        // Set the ignored nicks
-        setIgnoredNicks(p.getProperty("ignore", ""));
-
         // Save the entries
-        saveEntries(true);
+        UrlMgr.saveEntries(this, true);
     }
 
     /**
@@ -323,18 +317,18 @@ public class Mobibot extends PircBot {
     public static void main(final String[] args) {
         // Setup the command line options
         final Options options = new Options()
-                                        .addOption(Commands.HELP_ARG.substring(0, 1),
-                                                   Commands.HELP_ARG,
+                                        .addOption(Constants.HELP_ARG.substring(0, 1),
+                                                   Constants.HELP_ARG,
                                                    false,
                                                    "print this help message")
-                                        .addOption(Commands.DEBUG_ARG.substring(0, 1), Commands.DEBUG_ARG, false,
+                                        .addOption(Constants.DEBUG_ARG.substring(0, 1), Constants.DEBUG_ARG, false,
                                                    "print debug & logging data directly to the console")
-                                        .addOption(Option.builder(Commands.PROPS_ARG.substring(0, 1)).hasArg()
+                                        .addOption(Option.builder(Constants.PROPS_ARG.substring(0, 1)).hasArg()
                                                          .argName("file")
                                                          .desc("use " + "alternate properties file")
-                                                         .longOpt(Commands.PROPS_ARG).build())
-                                        .addOption(Commands.VERSION_ARG.substring(0, 1),
-                                                   Commands.VERSION_ARG,
+                                                         .longOpt(Constants.PROPS_ARG).build())
+                                        .addOption(Constants.VERSION_ARG.substring(0, 1),
+                                                   Constants.VERSION_ARG,
                                                    false,
                                                    "print version info");
 
@@ -350,18 +344,18 @@ public class Mobibot extends PircBot {
             System.exit(1);
         }
 
-        if (line.hasOption(Commands.HELP_ARG.charAt(0))) {
+        if (line.hasOption(Constants.HELP_ARG.charAt(0))) {
             // Output the usage
             new HelpFormatter().printHelp(Mobibot.class.getName(), options);
-        } else if (line.hasOption(Commands.VERSION_ARG.charAt(0))) {
-            for (final String s : INFO_STRS) {
+        } else if (line.hasOption(Constants.VERSION_ARG.charAt(0))) {
+            for (final String s : INFO) {
                 System.out.println(s);
             }
         } else {
             final Properties p = new Properties();
 
             try (final InputStream fis = Files.newInputStream(
-                    Paths.get(line.getOptionValue(Commands.PROPS_ARG.charAt(0), "./mobibot.properties")))) {
+                    Paths.get(line.getOptionValue(Constants.PROPS_ARG.charAt(0), "./mobibot.properties")))) {
                 // Load the properties files
                 p.load(fis);
             } catch (FileNotFoundException e) {
@@ -379,7 +373,7 @@ public class Mobibot extends PircBot {
             final String logsDir = Utils.ensureDir(p.getProperty("logs", "."), false);
 
             // Redirect the stdout and stderr
-            if (!line.hasOption(Commands.DEBUG_ARG.charAt(0))) {
+            if (!line.hasOption(Constants.DEBUG_ARG.charAt(0))) {
                 try {
                     final PrintStream stdout = new PrintStream(
                             new FileOutputStream(logsDir + channel.substring(1) + '.' + Utils.today() + ".log", true));
@@ -408,19 +402,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Sleeps for the specified number of seconds.
-     *
-     * @param secs The number of seconds to sleep for.
-     */
-    private static void sleep(final int secs) {
-        try {
-            Thread.sleep(secs * 1000L);
-        } catch (InterruptedException ignore) {
-            // Do nothing
-        }
-    }
-
     /**
      * Sends an action to the current channel.
      *
@@ -442,6 +423,27 @@ public class Mobibot extends PircBot {
         }
     }
 
+    /**
+     * Adds a module.
+     *
+     * @param module The module to add.
+     */
+    private void addModule(final AbstractModule module) {
+        modules.add(module);
+        modulesNames.add(module.getClass().getSimpleName());
+    }
+
+    /**
+     * Adds pin on pinboard.
+     *
+     * @param entry The entry to add.
+     */
+    public final void addPin(final EntryLink entry) {
+        if (pinboard != null) {
+            pinboard.addPost(entry);
+        }
+    }
+
     /**
      * Connects to the server and joins the channel.
      */
@@ -470,14 +472,22 @@ public class Mobibot extends PircBot {
                 }
             }
         }
-
-        setVersion(INFO_STRS[0]);
-
+        setVersion(INFO.get(0));
         identify();
-
         joinChannel();
     }
 
+    /**
+     * Deletes pin on pinboard.
+     *
+     * @param entry The entry to delete.
+     */
+    public final void deletePin(final EntryLink entry) {
+        if (pinboard != null) {
+            pinboard.deletePost(entry);
+        }
+    }
+
     /**
      * Responds with the title and links from the RSS feed.
      *
@@ -491,24 +501,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Returns the index of the specified duplicate entry, if any.
-     *
-     * @param link The link.
-     * @return The index or -1 if none.
-     */
-    private int findDupEntry(final String link) {
-        synchronized (entries) {
-            for (int i = 0; i < entries.size(); i++) {
-                if (link.equals(entries.get(i).getLink())) {
-                    return i;
-                }
-            }
-        }
-
-        return -1;
-    }
-
     /**
      * Returns the backlogs URL.
      *
@@ -564,6 +556,15 @@ public class Mobibot extends PircBot {
         return logsDir;
     }
 
+    /**
+     * Returns the enabled modules names.
+     *
+     * @return The modules names.
+     */
+    public final List<String> getModulesNames() {
+        return modulesNames;
+    }
+
     /**
      * Returns the bot's nickname regexp pattern.
      *
@@ -603,159 +604,114 @@ public class Mobibot extends PircBot {
     }
 
     /**
-     * Returns indented and bold help string.
+     * Responds with the commands help, if any.
      *
-     * @param help The help string.
-     * @return The indented help string.
+     * @param sender The nick of the person requesting Constants.
+     * @param topic  The help topic.
+     * @return {@code true} if the topic was found, {@code false} otherwise.
      */
-    public final String helpIndent(final String help) {
-        return helpIndent(help, true);
+    private boolean helpCommands(final String sender, final String topic) {
+        for (final AbstractCommand command : commands) {
+            if (command.isVisible() && command.getCommand().startsWith(topic)) {
+                return command.helpResponse(this, topic, sender, isOp(sender), true);
+            }
+        }
+        return false;
     }
 
     /**
-     * Returns indented help string.
+     * Responds with the default Constants.
      *
-     * @param help   The help string.
-     * @param isBold The bold flag.
-     * @return The indented help string.
+     * @param sender The nick of the person requesting Constants.
+     * @param isOp   The channel operator flag.
      */
-    public String helpIndent(final String help, final boolean isBold) {
-        return "        " + (isBold ? bold(help) : help);
+    public void helpDefault(final String sender, final boolean isOp) {
+        send(sender, Utils.bold("Type a URL on " + ircChannel + " to post it."));
+        send(sender, "For more information on a specific command, type:");
+        send(sender, Utils.helpIndent(getNick() + ": " + Constants.HELP_CMD + " <command>"));
+        send(sender, Utils.bold("The commands are:"));
+
+        if (commandsNames.isEmpty()) {
+            // Feed command
+            commandsNames.add(getChannelName());
+
+            // Commands
+            for (final AbstractCommand command : commands) {
+                if (command.isVisible()) {
+                    if (command.isOp()) {
+                        opsCommandsNames.add(command.getCommand());
+                    } else {
+                        commandsNames.add(command.getCommand());
+                    }
+                }
+            }
+
+            // Modules commands
+            modules.stream().filter(AbstractModule::isEnabled)
+                   .forEach(module -> commandsNames.addAll(module.getCommands()));
+
+            // Tell command
+            if (tell.isEnabled()) {
+                commandsNames.add(Tell.TELL_CMD);
+            }
+
+            Collections.sort(commandsNames);
+            Collections.sort(opsCommandsNames);
+        }
+
+        // Print 6 commands per line
+        final int chunk = 6;
+        for (int i = 0; i < commandsNames.size(); i += chunk) {
+            send(sender, Utils.helpIndent(
+                    String.join(" ", commandsNames.subList(i, Math.min(commandsNames.size(), i + chunk)))));
+        }
+
+        if (isOp) {
+            send(sender, Utils.bold("The op commands are:"));
+            send(sender, Utils.helpIndent(String.join(" ", opsCommandsNames)));
+        }
     }
 
     /**
-     * Responds with the bot's help.
+     * Responds with the modules help, if any.
+     *
+     * @param sender The nick of the person requesting Constants.
+     * @param topic  The help topic.
+     * @return {@code true} if the topic was found, {@code false} otherwise.
+     */
+    private boolean helpModules(final String sender, final String topic) {
+        for (final AbstractModule module : modules) {
+            for (final String cmd : module.getCommands()) {
+                if (topic.equals(cmd)) {
+                    module.helpResponse(this, sender, topic, true);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Responds with the bot's Constants.
      *
      * @param sender The nick of the person who sent the private message.
      * @param topic  The help topic, if any.
      */
     private void helpResponse(final String sender, final String topic) {
-        final String lcTopic = topic.toLowerCase(Constants.LOCALE).trim();
-
-        if (Commands.HELP_POSTING_KEYWORD.equals(lcTopic)) {
-            send(sender, bold("Post a URL, by saying it on a line on its own:"));
-            send(sender, helpIndent("<url> [<title>] [" + TAGS_MARKER + "<+tag> [...]]"));
-            send(sender, "I will reply with a label, for example: " + bold(Commands.LINK_CMD + '1'));
-            send(sender, "To add a title, use a its label and a pipe:");
-            send(sender, helpIndent(Commands.LINK_CMD + "1:|This is the title"));
-            send(sender, "To add a comment: ");
-            send(sender, helpIndent(Commands.LINK_CMD + "1:This is a comment"));
-            send(sender, "I will reply with a label, for example: " + bold(Commands.LINK_CMD + "1.1"));
-            send(sender, "To edit a comment, use its label: ");
-            send(sender, helpIndent(Commands.LINK_CMD + "1.1:This is an edited comment"));
-            send(sender, "To delete a comment, use its label and a minus sign: ");
-            send(sender, helpIndent(Commands.LINK_CMD + "1.1:-"));
-            send(sender, "You can also view a posting by saying its label.");
-        } else if (Commands.HELP_TAGS_KEYWORD.equals(lcTopic)) {
-            send(sender, bold("To categorize or tag a URL, use its label and a T:"));
-            send(sender, helpIndent(Commands.LINK_CMD + "1T:<+tag|-tag> [...]"));
-        } else if (Commands.VIEW_CMD.equals(lcTopic)) {
-            send(sender, "To list or search the current URL posts:");
-            send(sender, helpIndent(getNick() + ": " + Commands.VIEW_CMD) + " [<start>] [<query>]");
-        } else if (lcTopic.equalsIgnoreCase(getChannelName())) {
-            send(sender, "To list the last 5 posts from the channel's weblog:");
-            send(sender, helpIndent(getNick() + ": " + getChannelName()));
-        } else if (Commands.RECAP_CMD.equals(lcTopic)) {
-            send(sender, "To list the last 10 public channel messages:");
-            send(sender, helpIndent(getNick() + ": " + Commands.RECAP_CMD));
-        } else if (Commands.USERS_CMD.equals(lcTopic)) {
-            send(sender, "To list the users present on the channel:");
-            send(sender, helpIndent(getNick() + ": " + Commands.USERS_CMD));
-        } else if (Commands.INFO_CMD.equals(lcTopic)) {
-            send(sender, "To view information about the bot:");
-            send(sender, helpIndent(getNick() + ": " + Commands.INFO_CMD));
+        final boolean isOp = isOp(sender);
+        if (StringUtils.isBlank(topic)) {
+            helpDefault(sender, isOp);
         } else {
-            final String msg = "/msg ";
-            if (Commands.CYCLE_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To have the bot leave the channel and come back:");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.CYCLE_CMD));
-            } else if (Commands.ME_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To have the bot perform an action:");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.ME_CMD + " <action>"));
-            } else if (Commands.SAY_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To have the bot say something on the channel:");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.SAY_CMD + " <text>"));
-            } else if (Commands.VERSION_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To view the version data (bot, java, etc.):");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.VERSION_CMD));
-            } else if (Commands.MSG_CMD.equals(lcTopic) && isOp(sender)) {
-                send(sender, "To have the bot send a private message to someone:");
-                send(sender, helpIndent(msg + getNick() + ' ' + Commands.MSG_CMD + " <nick> <text>"));
-            } else if (Commands.IGNORE_CMD.equals(lcTopic)) {
-                send(sender, "To check your ignore status:");
-                send(sender, helpIndent(getNick() + ": " + Commands.IGNORE_CMD));
-
-                send(sender, "To toggle your ignore status:");
-                send(sender, helpIndent(getNick() + ": " + Commands.IGNORE_CMD + ' ' + Commands.IGNORE_ME_KEYWORD));
+            final String lcTopic = topic.toLowerCase(Constants.LOCALE).trim();
+            if (lcTopic.equals(getChannelName())) {
+                send(sender, Utils.bold("To list the last 5 posts from the channel's weblog:"));
+                send(sender, Utils.helpIndent(getNick() + ": " + getChannelName()));
             } else if (Tell.TELL_CMD.equals(lcTopic) && tell.isEnabled()) {
                 tell.helpResponse(sender);
             } else {
-                for (final AbstractModule module : MODULES) {
-                    for (final String cmd : module.getCommands()) {
-                        if (lcTopic.equals(cmd)) {
-                            module.helpResponse(this, sender, topic, true);
-                            return;
-                        }
-                    }
-                }
-
-                send(sender, bold("Type a URL on " + ircChannel + " to post it."));
-                send(sender, "For more information on a specific command, type:");
-                send(sender, helpIndent(getNick() + ": " + Commands.HELP_CMD + " <command>"));
-                send(sender, "The commands are:");
-
-                if (commandsList.isEmpty()) {
-                    commandsList.add(Commands.IGNORE_CMD);
-                    commandsList.add(Commands.INFO_CMD);
-                    commandsList.add(getChannelName());
-                    commandsList.add(Commands.HELP_POSTING_KEYWORD);
-                    commandsList.add(Commands.HELP_TAGS_KEYWORD);
-                    commandsList.add(Commands.RECAP_CMD);
-                    commandsList.add(Commands.USERS_CMD);
-                    commandsList.add(Commands.VIEW_CMD);
-
-                    MODULES.stream().filter(AbstractModule::isEnabled)
-                           .forEach(module -> commandsList.addAll(module.getCommands()));
-
-                    if (tell.isEnabled()) {
-                        commandsList.add(Tell.TELL_CMD);
-                    }
-
-                    Collections.sort(commandsList);
-                }
-
-                final StringBuilder sb = new StringBuilder(0);
-
-                for (int i = 0, cmdCount = 1; i < commandsList.size(); i++, cmdCount++) {
-                    if (sb.length() > 0) {
-                        sb.append("  ");
-                    }
-
-                    sb.append(commandsList.get(i));
-
-                    // 6 commands per line or last command
-                    if (sb.length() > 0 && (cmdCount == 6 || i == (commandsList.size() - 1))) {
-                        send(sender, helpIndent(sb.toString()));
-
-                        sb.setLength(0);
-                        cmdCount = 0;
-                    }
-                }
-
-                if (isOp(sender)) {
-                    send(sender, "The op commands are:");
-                    send(sender,
-                         helpIndent(Commands.CYCLE_CMD
-                                    + "  "
-                                    + Commands.ME_CMD
-                                    + "  "
-                                    + Commands.MODULES_CMD
-                                    + "  "
-                                    + Commands.MSG_CMD
-                                    + "  "
-                                    + Commands.SAY_CMD
-                                    + "  "
-                                    + Commands.VERSION_CMD));
+                // Command, Modules or Default
+                if (!helpCommands(sender, topic) && !helpModules(sender, lcTopic)) {
+                    helpDefault(sender, isOp);
                 }
             }
         }
@@ -776,98 +732,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Processes the {@link net.thauvin.erik.mobibot.Commands#IGNORE_CMD} command.
-     *
-     * @param sender The sender.
-     * @param args   The command arguments.
-     */
-    private void ignoreResponse(final String sender, final String args) {
-        if (!isOp(sender)) {
-            final String nick = sender.toLowerCase(Constants.LOCALE);
-            final boolean isMe = args.toLowerCase(Constants.LOCALE).startsWith(Commands.IGNORE_ME_KEYWORD);
-            if (isMe) {
-                if (ignoredNicks.remove(nick)) {
-                    send(sender, "You are no longer ignored.");
-                } else {
-                    ignoredNicks.add(nick);
-                    send(sender, "You are now ignored.");
-                }
-            } else {
-                if (ignoredNicks.contains(nick)) {
-                    send(sender, "You are currently ignored.");
-                } else {
-                    send(sender, "You are not currently ignored.");
-                }
-            }
-        } else {
-            if (args.length() > 0) {
-                final String[] nicks = args.toLowerCase(Constants.LOCALE).split(" ");
-
-                for (final String nick : nicks) {
-                    final String ignore;
-
-                    if (Commands.IGNORE_ME_KEYWORD.equals(nick)) {
-                        ignore = sender.toLowerCase(Constants.LOCALE);
-                    } else {
-                        ignore = nick;
-                    }
-
-                    if (!ignoredNicks.remove(ignore)) {
-                        ignoredNicks.add(ignore);
-                    }
-                }
-            }
-
-            send(sender, "The following nicks are ignored: " + ignoredNicks);
-        }
-    }
-
-    /**
-     * Responds with the bot's information.
-     *
-     * @param sender    The nick of the person who sent the message.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    private void infoResponse(final String sender, final boolean isPrivate) {
-        for (final String info : INFO_STRS) {
-            if (info.startsWith("https://")) {
-                send(sender, info, Colors.DARK_GREEN, isPrivate);
-            } else {
-                send(sender, info, isPrivate);
-            }
-        }
-
-        final StringBuilder info = new StringBuilder(29);
-
-        info.append("Uptime: ").append(Utils.uptime(ManagementFactory.getRuntimeMXBean().getUptime())).append(
-                " [Entries: ").append(entries.size());
-
-        if (isOp(sender)) {
-            if (tell.isEnabled()) {
-                info.append(", Messages: ").append(tell.size());
-            }
-
-            if (twitterAutoPost && twitterModule.isEnabled()) {
-                info.append(", Twitter: ").append(twitterAutoLinks.size());
-            }
-        }
-
-        info.append(", Recap: ").append(recap.size()).append(']');
-
-        send(sender, info.toString(), isPrivate);
-    }
-
-    /**
-     * Determines whether the specified nick should be ignored.
-     *
-     * @param nick The nick.
-     * @return <code>true</code> if the nick should be ignored, <code>false</code> otherwise.
-     */
-    private boolean isIgnoredNick(final String nick) {
-        return isNotBlank(nick) && ignoredNicks.contains(nick.toLowerCase(Constants.LOCALE));
-    }
-
     /**
      * Returns <code>true</code> if the specified sender is an Op on the {@link #ircChannel channel}.
      *
@@ -902,9 +766,7 @@ public class Mobibot extends PircBot {
         if (isNotBlank(weblogUrl)) {
             setVersion(weblogUrl);
         }
-
         sleep(5);
-
         connect();
     }
 
@@ -922,100 +784,7 @@ public class Mobibot extends PircBot {
 
         boolean isCommand = false;
 
-        // Capture URLs posted on the channel
-        if (message.matches(LINK_MATCH) && !isIgnoredNick(sender)) {
-            isCommand = true;
-
-            final String[] cmds = message.split(" ", 2);
-
-            if (cmds.length == 1 || (!cmds[1].contains(getNick()))) {
-                final String link = cmds[0].trim();
-                boolean isBackup = false;
-
-                final int dupIndex = findDupEntry(link);
-
-                if (dupIndex == -1) {
-                    if (!Utils.today().equals(today)) {
-                        isBackup = true;
-                        saveEntries(true);
-
-                        entries.clear();
-                        today = Utils.today();
-                    }
-
-                    final StringBuilder tags = new StringBuilder(defaultTags);
-                    String title = Constants.NO_TITLE;
-
-                    if (cmds.length == 2) {
-                        final String[] data = cmds[1].trim().split(TAGS_MARKER, 2);
-
-                        if (data.length == 1) {
-                            title = data[0].trim();
-                        } else {
-                            if (isNotBlank(data[0])) {
-                                title = data[0].trim();
-                            }
-
-                            tags.append(' ').append(data[1].trim());
-                        }
-                    }
-
-                    if (Constants.NO_TITLE.equals(title)) {
-                        try {
-                            final Document html = Jsoup.connect(link).userAgent("Mozilla").get();
-                            final String htmlTitle = html.title();
-
-                            if (isNotBlank(htmlTitle)) {
-                                final String[] split = htmlTitle.split("( \\| )", 2);
-                                if (split.length == 2) {
-                                    title = split[0];
-                                } else {
-                                    title = htmlTitle;
-                                }
-                            }
-                        } catch (IOException ignore) {
-                            // Do nothing
-                        }
-                    }
-
-                    if (!tagsKeywords.isEmpty()) {
-                        for (final String match : tagsKeywords) {
-                            final String m = match.trim();
-                            if (title.matches("(?i).*\\b" + m + "\\b.*")) {
-                                tags.append(' ').append(m);
-                            }
-                        }
-                    }
-
-                    entries.add(new EntryLink(link, title, sender, login, channel, tags.toString()));
-
-                    final int index = entries.size() - 1;
-                    final EntryLink entry = entries.get(index);
-                    send(channel, EntriesUtils.buildLink(index, entry));
-
-                    // Add link to pinboard
-                    if (pinboard != null) {
-                        pinboard.addPost(entry);
-                    }
-
-                    // Queue link for posting to twitter
-                    if (twitterAutoPost && twitterModule.isEnabled()) {
-                        twitterAutoLinks.add(index);
-                        timer.schedule(new TwitterTimer(this, index), Constants.TIMER_DELAY * 60L * 1000L);
-                    }
-
-                    saveEntries(isBackup);
-
-                    if (Constants.NO_TITLE.equals(entry.getTitle())) {
-                        send(sender, "Please specify a title, by typing:", true);
-                        send(sender, helpIndent(Commands.LINK_CMD + (index + 1) + ":|This is the title"), true);
-                    }
-                } else {
-                    final EntryLink entry = entries.get(dupIndex);
-                    send(sender, bold("Duplicate") + " >> " + EntriesUtils.buildLink(dupIndex, entry));
-                }
-            }
-        } else if (message.matches(getNickPattern() + ":.*")) { // mobibot: <command>
+        if (message.matches(getNickPattern() + ":.*")) { // mobibot: <command>
             isCommand = true;
 
             final String[] cmds = message.substring(message.indexOf(':') + 1).trim().split(" ", 2);
@@ -1027,209 +796,47 @@ public class Mobibot extends PircBot {
                 args = cmds[1].trim();
             }
 
-            if (cmd.startsWith(Commands.HELP_CMD)) { // mobibot: help
+            if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
                 helpResponse(sender, args);
-            } else if (Commands.RECAP_CMD.equals(cmd)) { // mobibot: recap
-                recapResponse(sender, false);
-            } else if (Commands.USERS_CMD.equals(cmd)) { // mobibot: users
-                usersResponse(sender, false);
-            } else if (Commands.INFO_CMD.equals(cmd)) { // mobibot: info
-                infoResponse(sender, false);
-            } else if (Commands.VERSION_CMD.equals(cmd)) { // mobbiot: version
-                versionResponse(sender, false);
             } else if (cmd.equalsIgnoreCase(getChannelName())) { // mobibot: <channel>
                 feedResponse(sender);
-            } else if (cmd.startsWith(Commands.VIEW_CMD)) { // mobibot: view
-                viewResponse(sender, args, false);
             } else if (cmd.startsWith(Tell.TELL_CMD) && tell.isEnabled()) { // mobibot: tell
                 tell.response(sender, args);
-            } else if (cmd.startsWith(Commands.IGNORE_CMD)) { // mobibot: ignore
-                ignoreResponse(sender, args);
             } else {
-                for (final AbstractModule module : MODULES) { // modules
-                    for (final String c : module.getCommands()) {
-                        if (cmd.startsWith(c)) {
-                            module.commandResponse(this, sender, cmd, args, false);
+                boolean skip = false;
+                // Commands
+                for (final AbstractCommand command : commands) {
+                    if (command.isPublic() && command.getCommand().startsWith(cmd)) {
+                        command.commandResponse(this, sender, login, args, isOp(sender), false);
+                        skip = true;
+                        break;
+                    }
+                }
+                if (!skip) {
+                    // Modules
+                    for (final AbstractModule module : modules) { // modules
+                        for (final String c : module.getCommands()) {
+                            if (cmd.startsWith(c)) {
+                                module.commandResponse(this, sender, cmd, args, false);
+                                break;
+                            }
                         }
                     }
                 }
             }
-        } else if (message.matches(Commands.LINK_CMD + "[0-9]+:.*")) { // L1:<comment>, L1:-, L1:|<title>, etc
-            isCommand = true;
-
-            final String[] cmds = message.substring(1).split(":", 2);
-            final int index = Integer.parseInt(cmds[0]) - 1;
-
-            // L1:<comment>
-            if (index < entries.size()) {
-                final String cmd = cmds[1].trim();
-
-                if (cmd.length() == 0) {
-                    final EntryLink entry = entries.get(index);
-                    send(channel, EntriesUtils.buildLink(index, entry));
-
-                    if (entry.hasTags()) {
-                        send(channel, EntriesUtils.buildTags(index, entry));
-                    }
-
-                    if (entry.hasComments()) {
-                        final EntryComment[] comments = entry.getComments();
-
-                        for (int i = 0; i < comments.length; i++) {
-                            send(channel, EntriesUtils.buildComment(index, i, comments[i]));
-                        }
-                    }
-                } else {
-                    // L1:-
-                    if ("-".equals(cmd)) {
-                        final EntryLink entry = entries.get(index);
-
-                        if (entry.getLogin().equals(login) || isOp(sender)) {
-                            if (pinboard != null) {
-                                pinboard.deletePost(entry);
-                            }
-
-                            if (twitterAutoPost && twitterModule.isEnabled()) {
-                                twitterAutoLinks.remove(index);
-                            }
-
-                            entries.remove(index);
-                            send(channel, "Entry " + Commands.LINK_CMD + (index + 1) + " removed.");
-                            saveEntries(false);
-                        } else {
-                            send(sender, "Please ask a channel op to remove this entry for you.");
-                        }
-                    } else if (cmd.charAt(0) == '|') { // L1:|<title>
-                        if (cmd.length() > 1) {
-                            final EntryLink entry = entries.get(index);
-                            entry.setTitle(cmd.substring(1).trim());
-
-                            if (pinboard != null) {
-                                pinboard.updatePost(entry.getLink(), entry);
-                            }
-
-                            send(channel, EntriesUtils.buildLink(index, entry));
-                            saveEntries(false);
-                        }
-                    } else if (cmd.charAt(0) == '=') { // L1:=<url>
-                        final EntryLink entry = entries.get(index);
-
-                        if (entry.getLogin().equals(login) || isOp(sender)) {
-                            final String link = cmd.substring(1);
-
-                            if (link.matches(LINK_MATCH)) {
-                                final String oldLink = entry.getLink();
-
-                                entry.setLink(link);
-
-                                if (pinboard != null) {
-                                    pinboard.updatePost(oldLink, entry);
-                                }
-
-                                send(channel, EntriesUtils.buildLink(index, entry));
-                                saveEntries(false);
-                            }
-                        } else {
-                            send(sender, "Please ask a channel op to change this link for you.");
-                        }
-                    } else if (cmd.charAt(0) == '?') { // L1:?<author>
-                        if (isOp(sender)) {
-                            if (cmd.length() > 1) {
-                                final EntryLink entry = entries.get(index);
-                                entry.setNick(cmd.substring(1));
-                                send(channel, EntriesUtils.buildLink(index, entry));
-                                saveEntries(false);
-                            }
-                        } else {
-                            send(sender, "Please ask a channel op to change the author of this link for you.");
-                        }
-                    } else {
-                        final EntryLink entry = entries.get(index);
-                        final int cindex = entry.addComment(cmd, sender);
-
-                        final EntryComment comment = entry.getComment(cindex);
-                        send(sender, EntriesUtils.buildComment(index, cindex, comment));
-                        saveEntries(false);
-                    }
-                }
-            }
-        } else if (message.matches(Commands.LINK_CMD + "[0-9]+T:.*")) { // L1T:<+-tag>
-            isCommand = true;
-
-            final String[] cmds = message.substring(1).split("T:", 2);
-            final int index = Integer.parseInt(cmds[0]) - 1;
-
-            if (index < entries.size()) {
-                final String cmd = cmds[1].trim();
-
-                final EntryLink entry = entries.get(index);
-
-                if (cmd.length() != 0) {
-                    if (entry.getLogin().equals(login) || isOp(sender)) {
-                        entry.setTags(cmd);
-
-                        if (pinboard != null) {
-                            pinboard.updatePost(entry.getLink(), entry);
-                        }
-
-                        send(channel, EntriesUtils.buildTags(index, entry));
-                        saveEntries(false);
-                    } else {
-                        send(sender, "Please ask a channel op to change the tags for you.");
-                    }
-                } else {
-                    if (entry.hasTags()) {
-                        send(channel, EntriesUtils.buildTags(index, entry));
-                    } else {
-                        send(sender, "The entry has no tags. Why don't add some?");
-                    }
-                }
-            }
-        } else if (message.matches(Commands.LINK_CMD + "[0-9]+\\.[0-9]+:.*")) { // L11:<command>
-            isCommand = true;
-
-            final String[] cmds = message.substring(1).split("[.:]", 3);
-            final int index = Integer.parseInt(cmds[0]) - 1;
-
-            if (index < entries.size()) {
-                final EntryLink entry = entries.get(index);
-                final int cindex = Integer.parseInt(cmds[1]) - 1;
-
-                if (cindex < entry.getCommentsCount()) {
-                    final String cmd = cmds[2].trim();
-
-                    // L11:
-                    if (cmd.length() == 0) {
-                        final EntryComment comment = entry.getComment(cindex);
-                        send(channel, EntriesUtils.buildComment(index, cindex, comment));
-                    } else if ("-".equals(cmd)) { // L11:-
-                        entry.deleteComment(cindex);
-                        send(channel, "Comment " + Commands.LINK_CMD + (index + 1) + '.' + (cindex + 1) + " removed.");
-                        saveEntries(false);
-                    } else if (cmd.charAt(0) == '?') { // L11:?<author>
-                        if (isOp(sender)) {
-                            if (cmd.length() > 1) {
-                                final EntryComment comment = entry.getComment(cindex);
-                                comment.setNick(cmd.substring(1));
-                                send(channel, EntriesUtils.buildComment(index, cindex, comment));
-                                saveEntries(false);
-                            }
-                        } else {
-                            send(sender, "Please ask a channel op to change the author of this comment for you.");
-                        }
-                    } else {
-                        entry.setComment(cindex, cmd, sender);
-
-                        final EntryComment comment = entry.getComment(cindex);
-                        send(sender, EntriesUtils.buildComment(index, cindex, comment));
-                        saveEntries(false);
-                    }
+        } else {
+            // Commands
+            for (final AbstractCommand command : commands) {
+                if (command.matches(message)) {
+                    command.commandResponse(this, sender, login, message, isOp(sender), false);
+                    isCommand = true;
+                    break;
                 }
             }
         }
 
         if (!isCommand) {
-            storeRecap(sender, message, false);
+            Recap.storeRecap(sender, message, false);
         }
 
         tell.send(sender, true);
@@ -1255,92 +862,48 @@ public class Mobibot extends PircBot {
             args = cmds[1].trim();
         }
 
-        if (cmd.startsWith(Commands.HELP_CMD)) {
+        final boolean isOp = isOp(sender);
+
+        if (cmd.startsWith(Constants.HELP_CMD)) {
             helpResponse(sender, args);
-        } else if ("kill".equals(cmd) && isOp(sender)) {
+        } else if (isOp && "kill".equals(cmd)) {
             sendRawLine("QUIT : Poof!");
             System.exit(0);
-        } else if (Commands.DIE_CMD.equals(cmd) && isOp(sender)) {
+        } else if (isOp && Constants.DIE_CMD.equals(cmd)) {
             send(ircChannel, sender + " has just signed my death sentence.");
             timer.cancel();
             twitterShutdown();
             twitterNotification("killed by  " + sender + " on " + ircChannel);
-            saveEntries(true);
+
             sleep(3);
             quitServer("The Bot Is Out There!");
             System.exit(0);
-        } else if (Commands.CYCLE_CMD.equals(cmd)) {
-            send(ircChannel, sender + " has just asked me to leave. I'll be back!");
-            sleep(0);
-            partChannel(ircChannel);
-            sleep(10);
-            joinChannel(ircChannel);
-        } else if (Commands.RECAP_CMD.equals(cmd)) {
-            recapResponse(sender, true);
-        } else if (Commands.USERS_CMD.equals(cmd)) {
-            usersResponse(sender, true);
-        } else if ((cmds.length > 1) && isOp(sender) && Commands.ADDLOG_CMD.equals(cmd)) {
+        } else if (isOp && (cmds.length > 1) && Constants.ADDLOG_CMD.equals(cmd)) {
             // e.g 2014-04-01
             final File backlog = new File(logsDir + args + EntriesMgr.XML_EXT);
             if (backlog.exists()) {
-                history.add(0, args);
-                send(sender, history.toString(), true);
+                UrlMgr.addHistory(0, args);
+                send(sender, UrlMgr.getHistory().toString(), true);
             } else {
                 send(sender, "The specified log could not be found.");
             }
-        } else if (Commands.ME_CMD.equals(cmd) && isOp(sender)) {
-            if (args.length() > 1) {
-                action(args);
-            } else {
-                helpResponse(sender, Commands.ME_CMD);
-            }
-        } else if (Commands.MODULES_CMD.equals(cmd) && isOp(sender)) {
-            if (MODULES.isEmpty()) {
-                send(sender, "There are not enabled modules.", true);
-            } else {
-                send(sender, "The enabled modules are: ");
-                for (final AbstractModule mod : MODULES) {
-                    send(sender, helpIndent(mod.getClass().getSimpleName()));
-                }
-            }
-        } else if ((cmds.length > 1) && isOp(sender) && Commands.NICK_CMD.equals(cmd)) {
-            changeNick(args);
-        } else if (Commands.SAY_CMD.equals(cmd) && isOp(sender)) {
-            if (cmds.length > 1) {
-                send(ircChannel, args, true);
-            } else {
-                helpResponse(sender, Commands.SAY_CMD);
-            }
-        } else if (Commands.MSG_CMD.equals(cmd) && isOp(sender)) {
-            if (cmds.length > 1) {
-                final String[] msg = args.split(" ", 2);
-
-                if (args.length() > 2) {
-                    send(msg[0], msg[1], true);
-                } else {
-                    helpResponse(sender, Commands.MSG_CMD);
-                }
-            } else {
-                helpResponse(sender, Commands.MSG_CMD);
-            }
-        } else if (Commands.VIEW_CMD.equals(cmd)) {
-            viewResponse(sender, args, true);
         } else if (Tell.TELL_CMD.equals(cmd) && tell.isEnabled()) {
             tell.response(sender, args);
-        } else if (Commands.INFO_CMD.equals(cmd)) {
-            infoResponse(sender, true);
-        } else if (Commands.VERSION_CMD.equals(cmd)) {
-            versionResponse(sender, true);
-        } else if (Commands.DEBUG_CMD.equals(cmd) && isOp(sender)) {
+        } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) {
             if (logger.isDebugEnabled()) {
                 Configurator.setLevel(logger.getName(), loggerLevel);
             } else {
                 Configurator.setLevel(logger.getName(), Level.DEBUG);
-
             }
             send(sender, "Debug logging is " + (logger.isDebugEnabled() ? "enabled." : "disabled."), true);
         } else {
-            for (final AbstractModule module : MODULES) {
+            for (final AbstractCommand command : commands) {
+                if (command.getCommand().startsWith(cmd)) {
+                    command.commandResponse(this, sender, login, args, isOp, true);
+                    return;
+                }
+            }
+            for (final AbstractModule module : modules) {
                 if (module.isPrivateMsgEnabled()) {
                     for (final String c : module.getCommands()) {
                         if (cmd.equals(c)) {
@@ -1350,8 +913,7 @@ public class Mobibot extends PircBot {
                     }
                 }
             }
-
-            helpResponse(sender, "");
+            helpDefault(sender, isOp);
         }
     }
 
@@ -1362,7 +924,7 @@ public class Mobibot extends PircBot {
     protected final void onAction(final String sender, final String login, final String hostname, final String target,
                                   final String action) {
         if (target != null && target.equals(ircChannel)) {
-            storeRecap(sender, action, true);
+            Recap.storeRecap(sender, action, true);
         }
     }
 
@@ -1382,31 +944,6 @@ public class Mobibot extends PircBot {
         tell.send(newNick);
     }
 
-    /**
-     * Responds with the last 10 public messages.
-     *
-     * @param sender    The nick of the person who sent the private message.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    private void recapResponse(final String sender, final boolean isPrivate) {
-        if (!recap.isEmpty()) {
-            for (final String r : recap) {
-                send(sender, r, isPrivate);
-            }
-        } else {
-            send(sender, "Sorry, nothing to recap.", true);
-        }
-    }
-
-    /**
-     * Saves the entries.
-     *
-     * @param isDayBackup Set the <code>true</code> if the daily backup file should also be created.
-     */
-    final void saveEntries(final boolean isDayBackup) {
-        EntriesMgr.saveEntries(this, entries, history, isDayBackup);
-    }
-
     /**
      * Sends a private message or notice.
      *
@@ -1518,21 +1055,6 @@ public class Mobibot extends PircBot {
         identMsg = msg;
     }
 
-    /**
-     * Sets the Ignored nicks.
-     *
-     * @param nicks The nicks to ignore
-     */
-    final void setIgnoredNicks(final String nicks) {
-        if (isNotBlank(nicks)) {
-            final StringTokenizer st = new StringTokenizer(nicks, ",");
-
-            while (st.hasMoreTokens()) {
-                ignoredNicks.add(st.nextToken().trim().toLowerCase(Constants.LOCALE));
-            }
-        }
-    }
-
     /**
      * Sets the pinboard authentication.
      *
@@ -1544,28 +1066,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Sets the default tags/categories.
-     *
-     * @param tags The tags.
-     */
-    final void setTags(final String tags) {
-        defaultTags = tags;
-    }
-
-    /**
-     * Sets the tags keywords matches.
-     *
-     * @param matches The tags keywords.
-     */
-    final void setTagsKeywords(final String matches) {
-        if (isNotBlank(matches)) {
-            tagsKeywords.addAll(Arrays.asList(matches.split(", +?| +")));
-        } else {
-            tagsKeywords.clear();
-        }
-    }
-
     /**
      * Sets the weblog URL.
      *
@@ -1576,31 +1076,36 @@ public class Mobibot extends PircBot {
     }
 
     /**
-     * Stores the last 10 public messages and actions.
+     * Sleeps for the specified number of seconds.
      *
-     * @param sender   The nick of the person who sent the private message.
-     * @param message  The actual message sent.
-     * @param isAction Set to <code>true</code> if the message is an action.
+     * @param secs The number of seconds to sleep for.
      */
-    private void storeRecap(final String sender, final String message, final boolean isAction) {
-        recap.add(
-                Utils.utcDateTime(LocalDateTime.now(Clock.systemUTC())) + " -> " + sender + (isAction ? " " : ": ")
-                + message);
-
-        if (recap.size() > MAX_RECAP) {
-            recap.remove(0);
+    public final void sleep(final int secs) {
+        try {
+            Thread.sleep(secs * 1000L);
+        } catch (InterruptedException ignore) {
+            // Do nothing
         }
     }
 
     /**
-     * Auto-post to twitter.
+     * Add an entry to be posted on twitter.
+     *
+     * @param index The entry index.
+     */
+    public void twitterAddEntry(final int index) {
+        twitterEntries.add(index);
+    }
+
+    /**
+     * Post an entry to twitter.
      *
      * @param index The post entry index.
      */
-    final void twitterAutoPost(final int index) {
-        if (twitterAutoPost && twitterModule.isEnabled()
-            && twitterAutoLinks.contains(index) && entries.size() >= index) {
-            final EntryLink entry = entries.get(index);
+    @SuppressFBWarnings("SUI_CONTAINS_BEFORE_REMOVE")
+    public final void twitterEntryPost(final int index) {
+        if (isTwitterAutoPost && twitterEntries.contains(index) && UrlMgr.getEntriesCount() >= index) {
+            final EntryLink entry = UrlMgr.getEntry(index);
             final String msg =
                     entry.getTitle() + ' ' + entry.getLink() + " via " + entry.getNick() + " on " + getChannel();
             new Thread(() -> {
@@ -1608,14 +1113,23 @@ public class Mobibot extends PircBot {
                     twitterModule.post(twitterHandle, msg, false);
                 } catch (ModuleException e) {
                     if (logger.isWarnEnabled()) {
-                        logger.warn("Failed to post link on twitter.", e);
+                        logger.warn("Failed to post entry on twitter.", e);
                     }
                 }
             }).start();
-            twitterAutoLinks.remove((Object) index);
+            twitterEntries.remove(index);
         }
     }
 
+    /**
+     * Return the total count of links to be posted to twitter.
+     *
+     * @return The count of twitter links.
+     */
+    public final int twitterLinksCount() {
+        return twitterEntries.size();
+    }
+
     /**
      * Send a notification to the registered Twitter handle.
      *
@@ -1638,133 +1152,35 @@ public class Mobibot extends PircBot {
         }
     }
 
+    /**
+     * Removes entry from twitter auto-post.
+     *
+     * @param index The entry's index.
+     */
+    public final void twitterRemoveEntry(final int index) {
+        twitterEntries.remove(index);
+    }
+
     /**
      * Post all the links on twitter on shutdown.
      */
     final void twitterShutdown() {
         if (twitterModule.isEnabled() && isNotBlank(twitterHandle)) {
-            for (final int i : twitterAutoLinks) {
-                twitterAutoPost(i);
+            for (final int i : twitterEntries) {
+                twitterEntryPost(i);
             }
         }
     }
 
     /**
-     * Responds with the users on a channel.
+     * Updates pin on pinboard.
      *
-     * @param sender    The nick of the person who sent the message.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
+     * @param oldUrl The old pin url.
+     * @param entry  The entry to update.
      */
-    private void usersResponse(final String sender, final boolean isPrivate) {
-        final User[] users = getUsers(ircChannel);
-        final String[] nicks = new String[users.length];
-
-        for (int i = 0; i < users.length; i++) {
-            final String nick = users[i].getNick();
-            if (isOp(nick)) {
-                nicks[i] = '@' + users[i].getNick();
-            } else {
-                nicks[i] = users[i].getNick();
-            }
-        }
-
-        Arrays.sort(nicks, String.CASE_INSENSITIVE_ORDER);
-
-        send(sender, String.join(" ", nicks), isPrivate);
-    }
-
-    /**
-     * Responds with the bot's version info.
-     *
-     * @param sender    The nick of the person who sent the message.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    private void versionResponse(final String sender, final boolean isPrivate) {
-        if (isOp(sender)) {
-            for (final String version : VERSION_STRS) {
-                send(sender, version, isPrivate);
-            }
-        }
-    }
-
-    /**
-     * Responds with the stored links.
-     *
-     * @param sender    The nick of the person who sent the message.
-     * @param args      The view command arguments.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    private void viewResponse(final String sender, final String args, final boolean isPrivate) {
-        if (!entries.isEmpty()) {
-            final int max = entries.size();
-            String lcArgs = args.toLowerCase(Constants.LOCALE);
-            int i = 0;
-
-            if ((lcArgs.length() <= 0) && (max > MAX_ENTRIES)) {
-                i = max - MAX_ENTRIES;
-            }
-
-            if (lcArgs.matches("^\\d+(| .*)")) {
-                final String[] split = lcArgs.split(" ", 2);
-
-                try {
-                    i = Integer.parseInt(split[0]);
-
-                    if (i > 0) {
-                        i--;
-                    }
-
-                    if (split.length == 2) {
-                        lcArgs = split[1].trim();
-                    } else {
-                        lcArgs = "";
-                    }
-
-                    if (i > max) {
-                        i = 0;
-                    }
-                } catch (NumberFormatException ignore) {
-                    // Do nothing
-                }
-            }
-
-            EntryLink entry;
-            int sent = 0;
-
-            for (; i < max; i++) {
-                entry = entries.get(i);
-
-                if (lcArgs.length() > 0) {
-                    if ((entry.getLink().toLowerCase(Constants.LOCALE).contains(lcArgs))
-                        || (entry.getTitle().toLowerCase(Constants.LOCALE).contains(lcArgs))
-                        || (entry.getNick().toLowerCase(Constants.LOCALE).contains(lcArgs))) {
-                        if (sent > MAX_ENTRIES) {
-                            send(sender,
-                                 "To view more, try: "
-                                 + bold(getNick() + ": " + Commands.VIEW_CMD + ' ' + (i + 1) + ' ' + lcArgs),
-                                 isPrivate);
-
-                            break;
-                        }
-
-                        send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate);
-                        sent++;
-                    }
-                } else {
-                    if (sent > MAX_ENTRIES) {
-                        send(sender,
-                             "To view more, try: " + bold(getNick() + ": " + Commands.VIEW_CMD + ' ' + (i + 1)),
-                             isPrivate);
-
-                        break;
-                    }
-
-                    send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate);
-                    sent++;
-                }
-            }
-        } else {
-            send(sender, "There is currently nothing to view. Why don't you post something?", isPrivate);
+    public final void updatePin(final String oldUrl, final EntryLink entry) {
+        if (pinboard != null) {
+            pinboard.updatePost(oldUrl, entry);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt b/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
index f3a5450..09abe27 100644
--- a/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
@@ -36,6 +36,6 @@ import java.util.*
 
 class TwitterTimer(var bot: Mobibot, private var index: Int) : TimerTask() {
     override fun run() {
-       bot.twitterAutoPost(index)
+        bot.twitterEntryPost(index)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java
index 1489ecf..056d216 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.java
@@ -159,6 +159,16 @@ public final class Utils {
         return colorize(s, Colors.DARK_GREEN);
     }
 
+    /**
+     * Returns indented help string.
+     *
+     * @param help The help string.
+     * @return The indented help string.
+     */
+    public static String helpIndent(final String help) {
+        return "        " + help;
+    }
+
     /**
      * Returns the specified date as an ISO local date string.
      *
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
new file mode 100644
index 0000000..aeaac2d
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -0,0 +1,67 @@
+/*
+ * AbstractCommand.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+
+abstract class AbstractCommand {
+    abstract val command: String
+    abstract val help: List<String>
+    abstract val isOp: Boolean
+    abstract val isPublic: Boolean
+    abstract val isVisible: Boolean
+
+    abstract fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    )
+
+    open fun helpResponse(bot: Mobibot, command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
+        if (!this.isOp || this.isOp == isOp) {
+            for (h in help) {
+                bot.send(sender, String.format(h, bot.nick), isPrivate)
+            }
+            return true
+        }
+        return false
+    }
+
+    open fun matches(message: String): Boolean {
+        return false
+    }
+
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
new file mode 100644
index 0000000..fa18a1b
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -0,0 +1,68 @@
+/*
+ * Cycle.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Cycle : AbstractCommand() {
+    private val wait = 10
+    override val command = "cycle"
+    override val help = listOf(
+        Utils.bold("To have the bot leave the channel and come back:"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.send(bot.channel, "$sender has just asked me to leave. I'll be back!")
+            bot.sleep(wait)
+            bot.partChannel(bot.channel)
+            bot.sleep(wait)
+            bot.joinChannel(bot.channel)
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
new file mode 100644
index 0000000..b67fc18
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -0,0 +1,111 @@
+/*
+ * Ignore.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import java.util.*
+
+class Ignore(defaultIgnore: String) : AbstractCommand() {
+    private val keyword = "me"
+
+    init {
+        if (defaultIgnore.isNotBlank()) {
+            ignored.addAll(defaultIgnore.split(", +?| +"))
+        }
+    }
+
+    override val command = IGNORE
+    override val help = listOf(
+        Utils.bold("To check your ignore status:"),
+        Utils.helpIndent("%s: $command"),
+        Utils.bold("To toggle your ignore status:"),
+        Utils.helpIndent("%s: $command $keyword")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        const val IGNORE = "ignore"
+        private val ignored = HashSet<String>()
+
+        @JvmStatic
+        fun isNotIgnored(nick: String): Boolean {
+            return !ignored.contains(nick.toLowerCase())
+        }
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            val nick = sender.toLowerCase()
+            val isMe = args.toLowerCase().startsWith(keyword)
+            if (isMe) {
+                if (ignored.remove(nick)) {
+                    bot.send(sender, "You are no longer ignored.")
+                } else {
+                    ignored.add(nick)
+                    bot.send(sender, "You are now ignored.")
+                }
+            } else {
+                if (ignored.contains(nick)) {
+                    bot.send(sender, "You are currently ignored.")
+                } else {
+                    bot.send(sender, "You are not currently ignored.")
+                }
+            }
+        } else {
+            if (args.isNotEmpty()) {
+                val nicks = args.toLowerCase().split(" ")
+                for (nick in nicks) {
+                    val ignore = if (keyword == nick) {
+                        sender.toLowerCase()
+                    } else {
+                        nick
+                    }
+                    if (!ignored.remove(ignore)) {
+                        ignored.add(ignore)
+                    }
+                }
+            }
+            bot.send(sender, "The following nicks are ignored: ${ignored.joinToString(", ")}")
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
new file mode 100644
index 0000000..7fe62e4
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
@@ -0,0 +1,92 @@
+/*
+ * Info.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.links.UrlMgr
+import org.jibble.pircbot.Colors
+import java.lang.management.ManagementFactory
+
+class Info : AbstractCommand() {
+    override val command = "info"
+    override val help = listOf(
+        Utils.bold("To view information about the bot:"),
+        Utils.helpIndent("%s: $command")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        for (info in Mobibot.INFO) {
+            if (info.startsWith("https://")) {
+                bot.send(sender, info, Colors.DARK_GREEN, isPrivate)
+            } else {
+                bot.send(sender, info, isPrivate)
+            }
+        }
+
+        val info = StringBuilder("Uptime: ")
+
+        with(info) {
+            append(Utils.uptime(ManagementFactory.getRuntimeMXBean().uptime))
+            append(" [Entries: ")
+            append(UrlMgr.entriesCount)
+
+            if (isOp) {
+                if (bot.tell.isEnabled) {
+                    append(", Messages: ")
+                    append(bot.tell.size())
+                }
+                if (bot.isTwitterAutoPost) {
+                    append(", Twitter: ")
+                    append(bot.twitterLinksCount())
+                }
+            }
+
+            append(", Recap: ")
+            append(Recap.recapCount())
+            append(']')
+        }
+
+        bot.send(sender, info.toString(), isPrivate)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
new file mode 100644
index 0000000..a229009
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
@@ -0,0 +1,62 @@
+/*
+ * Me.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Me : AbstractCommand() {
+    override val command = "me"
+    override val help = listOf(
+        Utils.bold("To have the bot perform an action:"),
+        Utils.helpIndent("/msg %s $command <action>")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.action(args)
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt b/src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt
new file mode 100644
index 0000000..79c6224
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt
@@ -0,0 +1,64 @@
+/*
+ * AbstractCommandImpl.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class MobibotVersion : AbstractCommand() {
+    override val command = "version"
+    override val help = listOf(
+        Utils.bold("To view the version data (bot, java, etc.):"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            for (v in Mobibot.MOBIBOT_VERSIONS) {
+                bot.send(sender, v, isPrivate)
+            }
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
new file mode 100644
index 0000000..de494a4
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -0,0 +1,68 @@
+/*
+ * Modules.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Modules : AbstractCommand() {
+    override val command = "modules"
+    override val help = listOf(
+        Utils.bold("To view a list of enabled modules:"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            val modulesNames = bot.modulesNames
+            if (modulesNames.isEmpty()) {
+                bot.send(sender, "There are no enabled modules.", true)
+            } else {
+                bot.send(sender, Utils.bold("The enabled modules are: "))
+                bot.send(sender, Utils.helpIndent(modulesNames.joinToString(", ")))
+            }
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
new file mode 100644
index 0000000..5c01b83
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -0,0 +1,67 @@
+/*
+ * Msg.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Msg : AbstractCommand() {
+    override val command = "msg"
+    override val help = listOf(
+        Utils.bold("To have the bot send a private message to someone:"),
+        Utils.helpIndent("/msg %s $command <nick> <text>")
+    )
+    override val isOp = true
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            val msg = args.split(" ", limit = 2)
+            if (args.length > 2) {
+                bot.send(msg[0], msg[1], true)
+            } else {
+                helpResponse(bot, command, sender, isOp, isPrivate)
+            }
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
new file mode 100644
index 0000000..41396ed
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -0,0 +1,62 @@
+/*
+ * Nick.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Nick : AbstractCommand() {
+    override val command = "nick"
+    override val help = listOf(
+        Utils.bold("To change the bot's nickname:"),
+        Utils.helpIndent("/msg %s $command <nick>")
+    )
+    override val isOp = true
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.changeNick(args)
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
new file mode 100644
index 0000000..2ffc255
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -0,0 +1,95 @@
+/*
+ * Recap.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import java.time.Clock
+import java.time.LocalDateTime
+import java.util.*
+
+class Recap : AbstractCommand() {
+    override val command = "recap"
+    override val help = listOf(
+        Utils.bold("To list the last 10 public channel messages:"),
+        Utils.helpIndent("%s: $command"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        private val recaps = ArrayList<String>(0)
+
+        @JvmStatic
+        fun recapCount(): Int {
+            return recaps.size
+        }
+
+        /**
+         * Stores the last 10 public messages and actions.
+         *
+         * @param sender   The nick of the person who sent the private message.
+         * @param message  The actual message sent.
+         * @param isAction Set to `true` if the message is an action.
+         */
+        @JvmStatic
+        fun storeRecap(sender: String, message: String, isAction: Boolean) {
+            recaps.add(
+                Utils.utcDateTime(LocalDateTime.now(Clock.systemUTC()))
+                    + " -> ${sender}: " + (if (isAction) " " else ": ") + message
+            )
+            if (recaps.size > 10) {
+                recaps.removeAt(0)
+            }
+        }
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (recaps.isNotEmpty()) {
+            for (r in recaps) {
+                bot.send(sender, r, isPrivate)
+            }
+        } else {
+            bot.send(sender, "Sorry, nothing to recap.", true)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
new file mode 100644
index 0000000..c0b1e79
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
@@ -0,0 +1,63 @@
+/*
+ * Say.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+
+class Say : AbstractCommand() {
+    override val command = "say"
+    override val help = listOf(
+        Utils.bold("To have the bot say something on the channel:"),
+        Utils.helpIndent("/msg %s $command <text>")
+    )
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.send(bot.channel, args, true)
+        } else {
+            bot.helpDefault(sender, isOp)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
new file mode 100644
index 0000000..1f0f735
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -0,0 +1,71 @@
+/*
+ * Users.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import org.jibble.pircbot.User
+import java.util.*
+
+class Users : AbstractCommand() {
+    override val command = "users"
+    override val help = listOf(
+        Utils.bold("To list the users present on the channel:"),
+        Utils.helpIndent("/msg %s $command")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val users: Array<User> = bot.getUsers(bot.channel)
+        val nicks = ArrayList<String>()
+        users.forEach { user ->
+            if (bot.isOp(user.nick)) {
+                nicks.add('@'.toString() + user.nick)
+            } else {
+                nicks.add(user.nick)
+            }
+        }
+
+        bot.send(sender, nicks.sorted().joinToString(" "), isPrivate)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
new file mode 100644
index 0000000..9e1138f
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -0,0 +1,130 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+
+class Comment : AbstractCommand() {
+    override val command = COMMAND
+    override val help = listOf(
+        Utils.bold("To add a comment:"),
+        Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
+        "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
+        Utils.bold("To edit a comment, use its label: "),
+        Utils.helpIndent("${Constants.LINK_CMD}1.1:This is an edited comment"),
+        Utils.bold("To delete a comment, use its label and a minus sign: "),
+        Utils.helpIndent("${Constants.LINK_CMD}1.1:-")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        const val COMMAND = "comment"
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val cmds = args.substring(1).split("[.:]".toRegex(), 3)
+        val index = cmds[0].toInt() - 1
+
+        if (index < UrlMgr.entriesCount) {
+            val entry: EntryLink = UrlMgr.getEntry(index)
+            val cindex = cmds[1].toInt() - 1
+            if (cindex < entry.commentsCount) {
+                val cmd = cmds[2].trim()
+
+                // L1.1:
+                if (cmd.isEmpty()) {
+                    val comment = entry.getComment(cindex)
+                    bot.send(bot.channel, EntriesUtils.buildComment(index, cindex, comment))
+                } else if ("-" == cmd) { // L11:-
+                    entry.deleteComment(cindex)
+                    bot.send(
+                        bot.channel,
+                        "Comment ${Constants.LINK_CMD}${index + 1}.${cindex + 1} removed."
+                    )
+                    UrlMgr.saveEntries(bot, false)
+                } else if (cmd[0] == '?') { // L1.1:?<author>
+                    if (isOp) {
+                        if (cmd.length > 1) {
+                            val comment = entry.getComment(cindex)
+                            comment.nick = cmd.substring(1)
+                            bot.send(bot.channel, EntriesUtils.buildComment(index, cindex, comment))
+                            UrlMgr.saveEntries(bot, false)
+                        }
+                    } else {
+                        bot.send(sender, "Please ask a channel op to change the author of this comment for you.")
+                    }
+                } else {
+                    entry.setComment(cindex, cmd, sender)
+                    val comment = entry.getComment(cindex)
+                    bot.send(sender, EntriesUtils.buildComment(index, cindex, comment))
+                    UrlMgr.saveEntries(bot, false)
+                }
+            }
+        }
+    }
+
+    override fun helpResponse(
+        bot: Mobibot,
+        command: String,
+        sender: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ): Boolean {
+        if (super.helpResponse(bot, command, sender, isOp, isPrivate)) {
+            if (isOp) {
+                bot.send(sender, Utils.bold("To change a comment's author:"), isPrivate)
+                bot.send(sender, Utils.helpIndent("/msg ${bot.nick} ${Constants.LINK_CMD}1.1:?<nick>"), isPrivate)
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun matches(message: String): Boolean {
+        return message.matches("^${Constants.LINK_CMD}[0-9]+\\.[0-9]+:.*".toRegex())
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
new file mode 100644
index 0000000..6d05a0e
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -0,0 +1,147 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+
+class Posting : AbstractCommand() {
+    override val command = "posting"
+    override val help = listOf(
+        Utils.bold("Post a URL, by saying it on a line on its own:"),
+        Utils.helpIndent("<url> [<title>] ${Tags.COMMAND}}: <+tag> [...]]"),
+        "I will reply with a label, for example:" + Utils.bold("${Constants.LINK_CMD}1"),
+        Utils.bold("To add a title, use its label and a pipe:"),
+        Utils.helpIndent("${Constants.LINK_CMD}1:|This is the title"),
+        Utils.bold("To add a comment:"),
+        Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
+        "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
+        Utils.bold("To edit a comment, see: "),
+        Utils.helpIndent("/msg %s ${Constants.HELP_CMD} ${Comment.COMMAND}")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val cmds = args.substring(1).split(":", limit = 2)
+        val index = cmds[0].toInt() - 1
+
+        if (index < UrlMgr.entriesCount) {
+            val cmd = cmds[1].trim()
+            if (cmd.isEmpty()) {
+                val entry: EntryLink = UrlMgr.getEntry(index)
+                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                if (entry.hasTags()) {
+                    bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+                }
+                if (entry.hasComments()) {
+                    val comments = entry.comments
+                    for (i in comments.indices) {
+                        bot.send(bot.channel, EntriesUtils.buildComment(index, i, comments[i]))
+                    }
+                }
+            } else {
+                // L1:-
+                if ("-" == cmd) {
+                    val entry: EntryLink = UrlMgr.getEntry(index)
+                    if (entry.login == login || isOp) {
+                        bot.deletePin(entry)
+                        if (bot.isTwitterAutoPost) {
+                            bot.twitterRemoveEntry(index)
+                        }
+                        UrlMgr.removeEntry(index)
+                        bot.send(bot.channel, "Entry ${Constants.LINK_CMD}${index + 1} removed.")
+                        UrlMgr.saveEntries(bot, false)
+                    } else {
+                        bot.send(sender, "Please ask a channel op to remove this entry for you.")
+                    }
+                } else if (cmd[0] == '|') { // L1:|<title>
+                    if (cmd.length > 1) {
+                        val entry: EntryLink = UrlMgr.getEntry(index)
+                        entry.title = cmd.substring(1).trim()
+                        bot.updatePin(entry.link, entry)
+                        bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                        UrlMgr.saveEntries(bot, false)
+                    }
+                } else if (cmd[0] == '=') { // L1:=<url>
+                    val entry: EntryLink = UrlMgr.getEntry(index)
+                    if (entry.login == login || isOp) {
+                        val link = cmd.substring(1)
+                        if (link.matches(UrlMgr.LINK_MATCH.toRegex())) {
+                            val oldLink = entry.link
+                            entry.link = link
+                            bot.updatePin(oldLink, entry)
+                            bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                            UrlMgr.saveEntries(bot, false)
+                        }
+                    } else {
+                        bot.send(sender, "Please ask channel op to change this link for you.")
+                    }
+                } else if (cmd[0] == '?') { // L1:?<author>
+                    if (isOp) {
+                        if (cmd.length > 1) {
+                            val entry: EntryLink = UrlMgr.getEntry(index)
+                            entry.nick = cmd.substring(1)
+                            bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                            UrlMgr.saveEntries(bot, false)
+                        }
+                    } else {
+                        bot.send(sender, "Please ask a channel op to change the author of this link for you.")
+                    }
+                } else {
+                    val entry: EntryLink = UrlMgr.getEntry(index)
+                    val cindex = entry.addComment(cmd, sender)
+                    val comment = entry.getComment(cindex)
+                    bot.send(sender, EntriesUtils.buildComment(index, cindex, comment))
+                    UrlMgr.saveEntries(bot, false)
+                }
+            }
+        }
+    }
+
+    override fun matches(message: String): Boolean {
+        return message.matches("${Constants.LINK_CMD}[0-9]+:.*".toRegex())
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
new file mode 100644
index 0000000..204f41f
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -0,0 +1,92 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+
+class Tags : AbstractCommand() {
+    override val command = COMMAND
+    override val help = listOf(
+        Utils.bold("To categorize or tag a URL, use its label and a T:"),
+        Utils.helpIndent("${Constants.LINK_CMD}1T:<+tag|-tag> [...]")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        const val COMMAND = "tags"
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val cmds = args.substring(1).split("T:", limit = 2)
+        val index = cmds[0].toInt() - 1
+
+        if (index < UrlMgr.entriesCount) {
+            val cmd = cmds[1].trim()
+            val entry: EntryLink = UrlMgr.getEntry(index)
+            if (cmd.isNotEmpty()) {
+                if (entry.login == login || isOp) {
+                    entry.setTags(cmd)
+                    bot.updatePin(entry.link, entry)
+                    bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+                    UrlMgr.saveEntries(bot, false)
+                } else {
+                    bot.send(sender, "Please ask a channel op to change the tags for you.")
+                }
+            } else {
+                if (entry.hasTags()) {
+                    bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+                } else {
+                    bot.send(sender, "The entry has no tags. Why don't add some?")
+                }
+            }
+        }
+    }
+
+    override fun matches(message: String): Boolean {
+        return message.matches("^${Constants.LINK_CMD}[0-9]+T:.*".toRegex())
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
new file mode 100644
index 0000000..c1a3b37
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -0,0 +1,243 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.TwitterTimer
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.commands.Ignore
+import net.thauvin.erik.mobibot.entries.EntriesMgr
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+import org.jsoup.Jsoup
+import java.io.IOException
+import java.util.*
+
+class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
+    private val tagsKeywords = ArrayList<String>()
+    override val command = Constants.LINK_CMD
+    override val help = emptyList<String>()
+    override val isOp = false
+    override val isPublic = false
+    override val isVisible = false
+
+    init {
+        tagsKeywords.addAll(keywords.split(", +?| +"))
+        Companion.defaultTags = defaultTags
+    }
+
+    companion object {
+        const val LINK_MATCH = "^[hH][tT][tT][pP](|[sS])://.*"
+
+        // Entries array
+        private val entries = ArrayList<EntryLink>(0)
+
+        // History/backlogs array
+        private val history = ArrayList<String>(0)
+        private lateinit var defaultTags: String
+
+        @JvmStatic
+        val entriesCount
+            get() = entries.size
+
+        @JvmStatic
+        var today: String = Utils.today()
+            private set
+
+        @JvmStatic
+        fun addHistory(index: Int, entry: String) {
+            history.add(index, entry)
+        }
+
+        /**
+         * Saves the entries.
+         *
+         * @param isDayBackup Set the `true` if the daily backup file should also be created.
+         */
+        @JvmStatic
+        fun saveEntries(bot: Mobibot, isDayBackup: Boolean) {
+            EntriesMgr.saveEntries(bot, entries, history, isDayBackup)
+        }
+
+        @JvmStatic
+        fun removeEntry(index: Int) {
+            entries.removeAt(index)
+        }
+
+        @JvmStatic
+        fun getEntry(index: Int): EntryLink {
+            return entries[index]
+        }
+
+        @JvmStatic
+        fun getHistory(): List<String> {
+            return history
+        }
+
+        @JvmStatic
+        fun startup(current: String, backlogs: String, channel: String) {
+            today = EntriesMgr.loadEntries(current, channel, entries)
+            if (Utils.today() != today) {
+                this.entries.clear()
+                today = Utils.today()
+            }
+            EntriesMgr.loadBacklogs(backlogs, history)
+        }
+    }
+
+    @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        val cmds = args.split(" ".toRegex(), 2)
+
+        if (Ignore.isNotIgnored(sender) && (cmds.size == 1
+                || !cmds[1].contains(bot.nick)
+                || !cmds[1].endsWith(" (${Ignore.IGNORE}"))) {
+            val link = cmds[0].trim()
+            var isBackup = false
+            val dupIndex: Int = findDupEntry(link)
+            if (dupIndex == -1) {
+                if (Utils.today() != today) {
+                    isBackup = true
+                    saveEntries(bot, true)
+                    entries.clear()
+                    today = Utils.today()
+                }
+                val tags: StringBuilder = StringBuilder(defaultTags)
+                var title = Constants.NO_TITLE
+                if (cmds.size == 2) {
+                    val data = cmds[1].trim().split("${Tags.COMMAND}:", limit = 2)
+                    if (data.size == 1) {
+                        title = data[0].trim()
+                    } else {
+                        if (data[0].isNotBlank()) {
+                            title = data[0].trim()
+                        }
+                        tags.append(' ').append(data[1].trim())
+                    }
+                }
+                if (Constants.NO_TITLE == title) {
+                    try {
+                        val html = Jsoup.connect(link).userAgent("Mozilla").get()
+                        val htmlTitle = html.title()
+                        if (htmlTitle.isNotBlank()) {
+                            val split = htmlTitle.split("( \\| )".toRegex(), 2)
+                            title = if (split.size == 2) {
+                                split[0]
+                            } else {
+                                htmlTitle
+                            }
+                        }
+                    } catch (ignore: IOException) {
+                        // Do nothing
+                    }
+                }
+                if (tagsKeywords.isNotEmpty()) {
+                    for (match in tagsKeywords) {
+                        val m = match.trim()
+                        if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
+                            tags.append(' ').append(m)
+                        }
+                    }
+                }
+                entries.add(EntryLink(link, title, sender, login, bot.channel, tags.toString()))
+                val index: Int = entries.size - 1
+                val entry: EntryLink = entries[index]
+                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+
+                // Add Entry to pinboard.
+                bot.addPin(entry)
+
+                // Queue link for posting to twitter
+                if (bot.isTwitterAutoPost) {
+                    bot.twitterAddEntry(index)
+                    Mobibot.timer.schedule(
+                        TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L
+                    )
+                }
+                saveEntries(bot, isBackup)
+                if (Constants.NO_TITLE == entry.title) {
+                    bot.send(sender, Utils.bold("Please specify a title, by typing:"), true)
+                    bot.send(
+                        sender,
+                        Utils.helpIndent(Constants.LINK_CMD + (index + 1) + ":|This is the title"),
+                        true
+                    )
+                }
+            } else {
+                val entry: EntryLink = entries[dupIndex]
+                bot.send(
+                    sender, Utils.bold("Duplicate") + " >> " + EntriesUtils.buildLink(dupIndex, entry)
+                )
+            }
+        }
+    }
+
+    override fun helpResponse(
+        bot: Mobibot,
+        command: String,
+        sender: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ): Boolean = false
+
+    /**
+     * Returns the index of the specified duplicate entry, if any.
+     *
+     * @param link The link.
+     * @return The index or -1 if none.
+     */
+    private fun findDupEntry(link: String): Int {
+        synchronized(entries) {
+            for (i in entries.indices) {
+                if (link == entries[i].link) {
+                    return i
+                }
+            }
+        }
+        return -1
+    }
+
+    override fun matches(message: String): Boolean {
+        return message.matches(LINK_MATCH.toRegex())
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
new file mode 100644
index 0000000..e45885d
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -0,0 +1,130 @@
+/*
+ * Links.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.entriesCount
+import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.getEntry
+import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntryLink
+
+class View : AbstractCommand() {
+    private val maxEntries = 8
+    override val command = VIEW_CMD
+    override val help = listOf(
+        Utils.bold("To list or search the current URL posts:"),
+        Utils.helpIndent("%s: $command [<start>] [<query>]")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    companion object {
+        const val VIEW_CMD = "view"
+    }
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (entriesCount != 0) {
+            val max = entriesCount
+            var lcArgs = args.toLowerCase(Constants.LOCALE)
+            var i = 0
+            if (lcArgs.isEmpty() && max > maxEntries) {
+                i = max - maxEntries
+            }
+            if (lcArgs.matches("^\\d+(| .*)".toRegex())) {
+                val split = lcArgs.split(" ", limit = 2)
+                try {
+                    i = split[0].toInt()
+                    if (i > 0) {
+                        i--
+                    }
+                    lcArgs = if (split.size == 2) {
+                        split[1].trim()
+                    } else {
+                        ""
+                    }
+                    if (i > max) {
+                        i = 0
+                    }
+                } catch (ignore: NumberFormatException) {
+                    // Do nothing
+                }
+            }
+            var entry: EntryLink
+            var sent = 0
+            while (i < max) {
+                entry = getEntry(i)
+                if (lcArgs.isNotEmpty()) {
+                    if (entry.link.toLowerCase().contains(lcArgs)
+                        || entry.title.toLowerCase().contains(lcArgs)
+                        || entry.nick.toLowerCase().contains(lcArgs)) {
+                        if (sent > maxEntries) {
+                            bot.send(
+                                sender, "To view more, try: "
+                                + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs"),
+                                isPrivate
+                            )
+                            break
+                        }
+                        bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate)
+                        sent++
+                    }
+                } else {
+                    if (sent > maxEntries) {
+                        bot.send(
+                            sender,
+                            "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1}"),
+                            isPrivate
+                        )
+                        break
+                    }
+                    bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate)
+                    sent++
+                }
+                i++
+            }
+        } else {
+            bot.send(sender, "There is currently nothing to view. Why don't you post something?", isPrivate)
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
similarity index 75%
rename from src/main/java/net/thauvin/erik/mobibot/tell/Tell.java
rename to src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index 9692505..e8cee58 100644
--- a/src/main/java/net/thauvin/erik/mobibot/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -30,12 +30,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.tell;
+package net.thauvin.erik.mobibot.commands.tell;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Commands;
 import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
+import net.thauvin.erik.mobibot.commands.links.View;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
@@ -112,16 +112,16 @@ public class Tell {
     }
 
     /**
-     * Responds with help.
+     * Responds with Constants.
      *
      * @param sender The sender.
      */
     public void helpResponse(final String sender) {
         bot.send(sender, "To send a message to someone when they join the channel:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TELL_CMD + " <nick> <message>"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + " <nick> <message>"));
 
         bot.send(sender, "To view queued and sent messages:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + Commands.VIEW_CMD));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + View.VIEW_CMD));
 
         bot.send(sender, "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."));
     }
@@ -141,19 +141,20 @@ public class Tell {
      * @param sender The sender's nick.
      * @param cmds   The commands string.
      */
-    @SuppressFBWarnings(value = "CC_CYCLOMATIC_COMPLEXITY", justification = "Working on it.")
+    @SuppressFBWarnings(value = "CC_CYCLOMATIC_COMPLEXITY",
+                        justification = "Working on it.")
     public void response(final String sender, final String cmds) {
         final String arrow = " --> ";
         if (StringUtils.isBlank(cmds)) {
             helpResponse(sender);
-        } else if (cmds.startsWith(Commands.VIEW_CMD)) {
-            if (bot.isOp(sender) && (Commands.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(cmds)) {
+        } else if (cmds.startsWith(View.VIEW_CMD)) {
+            if (bot.isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(cmds)) {
                 if (!messages.isEmpty()) {
                     for (final TellMessage message : messages) {
                         bot.send(sender, Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
-                                + " [ID: " + message.getId() + ", "
-                                + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
-                            true);
+                                         + " [ID: " + message.getId() + ", "
+                                         + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
+                                 true);
                     }
                 } else {
                     bot.send(sender, "There are no messages in the queue.", true);
@@ -170,20 +171,20 @@ public class Tell {
 
                         if (message.isReceived()) {
                             bot.send(sender,
-                                Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
-                                    + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
-                                    + message.getId() + ", DELIVERED]",
-                                true);
+                                     Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
+                                     + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
+                                     + message.getId() + ", DELIVERED]",
+                                     true);
 
                         } else {
                             bot.send(sender,
-                                Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
-                                    + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
-                                    + message.getId() + ", QUEUED]",
-                                true);
+                                     Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
+                                     + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
+                                     + message.getId() + ", QUEUED]",
+                                     true);
                         }
 
-                        bot.send(sender, bot.helpIndent(message.getMessage(), false), true);
+                        bot.send(sender, Utils.helpIndent(message.getMessage()), true);
                     }
                 }
 
@@ -192,10 +193,10 @@ public class Tell {
                 } else {
                     bot.send(sender, "To delete one or all delivered messages:");
                     bot.send(sender,
-                        bot.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
-                            + TELL_ALL_KEYWORD + '>'));
+                             Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
+                                              + TELL_ALL_KEYWORD + '>'));
                     bot.send(sender, "Messages are kept for " + Utils.bold(maxDays)
-                        + Utils.plural(maxDays, " day.", " days."));
+                                     + Utils.plural(maxDays, " day.", " days."));
                 }
             }
         } else if (cmds.startsWith(TELL_DEL_KEYWORD + ' ')) {
@@ -259,7 +260,7 @@ public class Tell {
                     save();
 
                     bot.send(sender, "Message [ID " + message.getId() + "] was queued for "
-                        + Utils.bold(message.getRecipient()), true);
+                                     + Utils.bold(message.getRecipient()), true);
                 } else {
                     bot.send(sender, "Sorry, the messages queue is currently full.", true);
                 }
@@ -289,43 +290,42 @@ public class Tell {
      */
     public void send(final String nickname, final boolean isMessage) {
         if (!nickname.equals(bot.getNick()) && isEnabled()) {
-            messages.stream().filter(message -> message.isMatch(nickname)).forEach(
-                message -> {
-                    if (message.getRecipient().equalsIgnoreCase(nickname) && !message.isReceived()) {
-                        if (message.getSender().equals(nickname)) {
-                            if (!isMessage) {
-                                bot.send(nickname, Utils.bold("You") + " wanted me to remind you: "
-                                        + Utils.reverseColor(message.getMessage()),
-                                    true);
-
-                                message.setIsReceived();
-                                message.setIsNotified();
-
-                                save();
-                            }
-                        } else {
-                            bot.send(nickname, message.getSender() + " wanted me to tell you: "
-                                    + Utils.reverseColor(message.getMessage()),
-                                true);
+            messages.stream().filter(message -> message.isMatch(nickname)).forEach(message -> {
+                if (message.getRecipient().equalsIgnoreCase(nickname) && !message.isReceived()) {
+                    if (message.getSender().equals(nickname)) {
+                        if (!isMessage) {
+                            bot.send(nickname, Utils.bold("You") + " wanted me to remind you: "
+                                               + Utils.reverseColor(message.getMessage()),
+                                     true);
 
                             message.setIsReceived();
+                            message.setIsNotified();
 
                             save();
                         }
-                    } else if (message.getSender().equalsIgnoreCase(nickname) && message.isReceived()
-                        && !message.isNotified()) {
-                        bot.send(nickname,
-                            "Your message "
-                                + Utils.reverseColor("[ID " + message.getId() + ']') + " was sent to "
-                                + Utils.bold(message.getRecipient()) + " on "
-                                + Utils.utcDateTime(message.getReceived()),
-                            true);
+                    } else {
+                        bot.send(nickname, message.getSender() + " wanted me to tell you: "
+                                           + Utils.reverseColor(message.getMessage()),
+                                 true);
 
-                        message.setIsNotified();
+                        message.setIsReceived();
 
                         save();
                     }
-                });
+                } else if (message.getSender().equalsIgnoreCase(nickname) && message.isReceived()
+                           && !message.isNotified()) {
+                    bot.send(nickname,
+                             "Your message "
+                             + Utils.reverseColor("[ID " + message.getId() + ']') + " was sent to "
+                             + Utils.bold(message.getRecipient()) + " on "
+                             + Utils.utcDateTime(message.getReceived()),
+                             true);
+
+                    message.setIsNotified();
+
+                    save();
+                }
+            });
         }
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/tell/TellMessage.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
similarity index 99%
rename from src/main/java/net/thauvin/erik/mobibot/tell/TellMessage.java
rename to src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
index 9d39e22..89dafab 100644
--- a/src/main/java/net/thauvin/erik/mobibot/tell/TellMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
@@ -30,7 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.tell;
+package net.thauvin.erik.mobibot.commands.tell;
 
 import java.io.Serializable;
 import java.time.Clock;
diff --git a/src/main/java/net/thauvin/erik/mobibot/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
similarity index 99%
rename from src/main/java/net/thauvin/erik/mobibot/tell/TellMessagesMgr.java
rename to src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
index ad6cb0a..c03af95 100644
--- a/src/main/java/net/thauvin/erik/mobibot/tell/TellMessagesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
@@ -30,7 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.tell;
+package net.thauvin.erik.mobibot.commands.tell;
 
 import org.apache.logging.log4j.Logger;
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
index 636fbe4..f0485db 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
@@ -33,7 +33,6 @@
 package net.thauvin.erik.mobibot.entries;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Commands;
 import net.thauvin.erik.mobibot.Constants;
 import net.thauvin.erik.mobibot.Utils;
 
@@ -61,8 +60,8 @@ public final class EntriesUtils {
      * @return The entry's comment.
      */
     public static String buildComment(final int entryIndex, final int commentIndex, final EntryComment comment) {
-        return (Commands.LINK_CMD + (entryIndex + 1) + '.' + (commentIndex + 1) + ": [" + comment.getNick() + "] "
-            + comment.getComment());
+        return (Constants.LINK_CMD + (entryIndex + 1) + '.' + (commentIndex + 1) + ": [" + comment.getNick() + "] "
+                + comment.getComment());
     }
 
     /**
@@ -87,8 +86,8 @@ public final class EntriesUtils {
      */
     @SuppressFBWarnings(value = "CE_CLASS_ENVY", justification = "Yes, it does.")
     public static String buildLink(final int index, final EntryLink entry, final boolean isView) {
-        final StringBuilder buff = new StringBuilder().append(Commands.LINK_CMD).append(index + 1)
-            .append(": ").append('[').append(entry.getNick()).append(']');
+        final StringBuilder buff = new StringBuilder().append(Constants.LINK_CMD).append(index + 1)
+                                                      .append(": ").append('[').append(entry.getNick()).append(']');
 
         if (isView && entry.hasComments()) {
             buff.append("[+").append(entry.getCommentsCount()).append(']');
@@ -115,6 +114,6 @@ public final class EntriesUtils {
      * @return The entry's tags.
      */
     public static String buildTags(final int entryIndex, final EntryLink entry) {
-        return (Commands.LINK_CMD + (entryIndex + 1) + "T: " + entry.getPinboardTags().replace(",", ", "));
+        return (Constants.LINK_CMD + (entryIndex + 1) + "T: " + entry.getPinboardTags().replace(",", ", "));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
index 2d5409d..671db96 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
@@ -95,7 +95,7 @@ public abstract class AbstractModule {
     }
 
     /**
-     * Responds with the module's help.
+     * Responds with the module's Constants.
      *
      * @param bot       The bot's instance.
      * @param sender    The sender.
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
index 6d4a304..8201c8b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
@@ -35,10 +35,13 @@ package net.thauvin.erik.mobibot.modules;
 import net.objecthunter.exp4j.Expression;
 import net.objecthunter.exp4j.ExpressionBuilder;
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.text.DecimalFormat;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Calc module.
  *
@@ -88,7 +91,6 @@ public class Calc extends AbstractModule {
                                 final boolean isPrivate) {
         if (StringUtils.isNotBlank(args)) {
             bot.send(calc(args));
-
         } else {
             helpResponse(bot, sender, args, isPrivate);
         }
@@ -99,7 +101,7 @@ public class Calc extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To solve a mathematical calculation:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + CALC_CMD + " <calculation>"));
+        bot.send(sender, bold("To solve a mathematical calculation:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CALC_CMD + " <calculation>"));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
index a43f241..c66f968 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
@@ -56,6 +56,8 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The CurrentConverter module.
  *
@@ -228,14 +230,14 @@ public final class CurrencyConverter extends ThreadedModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To convert from one currency to another:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + CURRENCY_CMD + " [100 USD to EUR]"));
+        bot.send(sender, bold("To convert from one currency to another:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD + " [100 USD to EUR]"));
 
         if (args.endsWith(CURRENCY_CMD)) {
-            bot.send(sender, "For a listing of currency rates:");
-            bot.send(sender, bot.helpIndent(bot.getNick() + ": " + CURRENCY_CMD) + ' ' + CURRENCY_RATES_KEYWORD);
-            bot.send(sender, "For a listing of supported currencies:");
-            bot.send(sender, bot.helpIndent(bot.getNick() + ": " + CURRENCY_CMD));
+            bot.send(sender, bold("For a listing of currency rates:"));
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD) + ' ' + CURRENCY_RATES_KEYWORD);
+            bot.send(sender, bold("For a listing of supported currencies:"));
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD));
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
index 62b750c..4388724 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
@@ -37,6 +37,8 @@ import net.thauvin.erik.mobibot.Utils;
 
 import java.security.SecureRandom;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Dice module.
  *
@@ -72,15 +74,15 @@ public final class Dice extends AbstractModule {
         final int playerTotal = i + y;
 
         bot.send(bot.getChannel(),
-                 sender + " rolled two dice: " + Utils.bold(i) + " and " + Utils.bold(y) + " for a total of "
-                 + Utils.bold(playerTotal));
+                 sender + " rolled two dice: " + bold(i) + " and " + bold(y) + " for a total of "
+                 + bold(playerTotal));
 
         i = r.nextInt(6) + 1;
         y = r.nextInt(6) + 1;
         final int total = i + y;
 
         bot.action(
-                "rolled two dice: " + Utils.bold(i) + " and " + Utils.bold(y) + " for a total of " + Utils.bold(total));
+                "rolled two dice: " + bold(i) + " and " + bold(y) + " for a total of " + bold(total));
 
         if (playerTotal < total) {
             bot.action("wins.");
@@ -96,7 +98,7 @@ public final class Dice extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To roll the dice:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + DICE_CMD));
+        bot.send(sender, bold("To roll the dice:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + DICE_CMD));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
index e180fb5..f40b5af 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
@@ -52,6 +52,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The GoogleSearch module.
  *
@@ -79,14 +81,74 @@ public final class GoogleSearch extends ThreadedModule {
         properties.put(GOOGLE_CSE_KEY_PROP, "");
     }
 
+    /**
+     * Performs a search on Google.
+     *
+     * @param query  The search query.
+     * @param apiKey The Google API key.
+     * @param cseKey The Google CSE key.
+     * @return The {@link Message} array containing the search results.
+     * @throws ModuleException If an error occurs while searching.
+     */
+    @SuppressFBWarnings({ "URLCONNECTION_SSRF_FD", "REC_CATCH_EXCEPTION" })
+    @SuppressWarnings(("PMD.AvoidInstantiatingObjectsInLoops"))
+    static List<Message> searchGoogle(final String query, final String apiKey, final String cseKey)
+            throws ModuleException {
+        if (StringUtils.isBlank(apiKey) || StringUtils.isBlank(cseKey)) {
+            throw new ModuleException(StringUtils.capitalize(GOOGLE_CMD) + " is disabled. The API keys are missing.");
+        }
+
+        if (StringUtils.isNotBlank(query)) {
+            final ArrayList<Message> results = new ArrayList<>();
+            try {
+                final String q = URLEncoder.encode(query, StandardCharsets.UTF_8.toString());
+
+                final URL url =
+                        new URL("https://www.googleapis.com/customsearch/v1?key="
+                                + apiKey
+                                + "&cx="
+                                + cseKey
+                                + "&q="
+                                + q
+                                + "&filter=1&num=5&alt=json");
+                final URLConnection conn = url.openConnection();
+
+                final StringBuilder sb = new StringBuilder();
+                try (final BufferedReader reader =
+                             new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        sb.append(line);
+                    }
+
+                    final JSONObject json = new JSONObject(sb.toString());
+                    final JSONArray ja = json.getJSONArray("items");
+
+                    for (int i = 0; i < ja.length(); i++) {
+                        final JSONObject j = ja.getJSONObject(i);
+                        results.add(new NoticeMessage(Utils.unescapeXml(j.getString("title"))));
+                        results.add(
+                                new NoticeMessage(TAB_INDENT + j.getString("link"), Colors.DARK_GREEN));
+                    }
+                }
+            } catch (IOException e) {
+                throw new ModuleException("searchGoogle(" + query + ')', "An error has occurred searching Google.", e);
+            }
+
+            return results;
+        } else {
+            throw new ModuleException("Invalid query.");
+        }
+    }
+
     /**
      * {@inheritDoc}
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
         if (isEnabled()) {
-            bot.send(sender, "To search Google:");
-            bot.send(sender, bot.helpIndent(bot.getNick() + ": " + GOOGLE_CMD + " <query>"));
+            bot.send(sender, bold("To search Google:"));
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + GOOGLE_CMD + " <query>"));
         } else {
             bot.send(sender, "The Google search module is disabled.");
         }
@@ -100,7 +162,7 @@ public final class GoogleSearch extends ThreadedModule {
         if (StringUtils.isNotBlank(query)) {
             try {
                 final List<Message> results = searchGoogle(query, properties.get(GOOGLE_API_KEY_PROP),
-                    properties.get(GOOGLE_CSE_KEY_PROP));
+                                                           properties.get(GOOGLE_CSE_KEY_PROP));
                 for (final Message msg : results) {
                     bot.send(sender, msg);
                 }
@@ -112,64 +174,4 @@ public final class GoogleSearch extends ThreadedModule {
             helpResponse(bot, sender, query, true);
         }
     }
-
-    /**
-     * Performs a search on Google.
-     *
-     * @param query  The search query.
-     * @param apiKey The Google API key.
-     * @param cseKey The Google CSE key.
-     * @return The {@link Message} array containing the search results.
-     * @throws ModuleException If an error occurs while searching.
-     */
-    @SuppressFBWarnings({"URLCONNECTION_SSRF_FD", "REC_CATCH_EXCEPTION"})
-    @SuppressWarnings(("PMD.AvoidInstantiatingObjectsInLoops"))
-    static List<Message> searchGoogle(final String query, final String apiKey, final String cseKey)
-        throws ModuleException {
-        if (StringUtils.isBlank(apiKey) || StringUtils.isBlank(cseKey)) {
-            throw new ModuleException(StringUtils.capitalize(GOOGLE_CMD) + " is disabled. The API keys are missing.");
-        }
-
-        if (StringUtils.isNotBlank(query)) {
-            final ArrayList<Message> results = new ArrayList<>();
-            try {
-                final String q = URLEncoder.encode(query, StandardCharsets.UTF_8.toString());
-
-                final URL url =
-                    new URL("https://www.googleapis.com/customsearch/v1?key="
-                        + apiKey
-                        + "&cx="
-                        + cseKey
-                        + "&q="
-                        + q
-                        + "&filter=1&num=5&alt=json");
-                final URLConnection conn = url.openConnection();
-
-                final StringBuilder sb = new StringBuilder();
-                try (final BufferedReader reader =
-                         new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        sb.append(line);
-                    }
-
-                    final JSONObject json = new JSONObject(sb.toString());
-                    final JSONArray ja = json.getJSONArray("items");
-
-                    for (int i = 0; i < ja.length(); i++) {
-                        final JSONObject j = ja.getJSONObject(i);
-                        results.add(new NoticeMessage(Utils.unescapeXml(j.getString("title"))));
-                        results.add(
-                            new NoticeMessage(TAB_INDENT + j.getString("link"), Colors.DARK_GREEN));
-                    }
-                }
-            } catch (IOException e) {
-                throw new ModuleException("searchGoogle(" + query + ')', "An error has occurred searching Google.", e);
-            }
-
-            return results;
-        } else {
-            throw new ModuleException("Invalid query.");
-        }
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
index 2210baf..199e4e7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
@@ -44,6 +44,8 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Joke module.
  *
@@ -126,7 +128,7 @@ public final class Joke extends ThreadedModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To retrieve a random joke:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + JOKE_CMD));
+        bot.send(sender, bold("To retrieve a random joke:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + JOKE_CMD));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
index a3b808f..676ebbe 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
@@ -34,12 +34,15 @@ package net.thauvin.erik.mobibot.modules;
 
 import net.thauvin.erik.mobibot.Constants;
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 import org.apache.commons.net.whois.WhoisClient;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Lookup module.
  *
@@ -195,7 +198,7 @@ public final class Lookup extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To perform a DNS lookup query:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + LOOKUP_CMD + " <ip address or hostname>"));
+        bot.send(sender, bold("To perform a DNS lookup query:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + LOOKUP_CMD + " <ip address or hostname>"));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
index 214a1ed..4e689a8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
@@ -33,11 +33,14 @@
 package net.thauvin.erik.mobibot.modules;
 
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.List;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Ping module.
  *
@@ -94,7 +97,7 @@ public class Ping extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To ping the bot:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + PING_CMD));
+        bot.send(sender, bold("To ping the bot:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + PING_CMD));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 903bf90..a3de8e5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -33,7 +33,10 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.green
+import net.thauvin.erik.mobibot.Utils.helpIndent
+import net.thauvin.erik.mobibot.Utils.red
 import kotlin.random.Random
 
 
@@ -71,7 +74,7 @@ class RockPaperScissors : AbstractModule() {
 
     companion object {
         // For testing.
-        fun winLoseOrDraw(player: String, bot: String ): String {
+        fun winLoseOrDraw(player: String, bot: String): String {
             val hand = Hands.valueOf(player.toUpperCase())
             val botHand = Hands.valueOf(bot.toUpperCase())
 
@@ -88,26 +91,26 @@ class RockPaperScissors : AbstractModule() {
         val botHand = Hands.values()[Random.nextInt(0, Hands.values().size)]
         when {
             hand == botHand -> {
-                bot.action("${Utils.green(hand.name)} vs. ${Utils.green(botHand.name)} ~ The game is tied ~")
+                bot.action("${green(hand.name)} vs. ${green(botHand.name)} ~ The game is tied ~")
             }
             hand.beats(botHand) -> {
                 bot.action(
-                    "${Utils.green(hand.name)} ${Utils.bold(hand.action)} ${Utils.red(botHand.name)} ~ You win ~"
+                    "${green(hand.name)} ${bold(hand.action)} ${red(botHand.name)} ~ You win ~"
                 )
             }
             else -> {
                 bot.action(
-                    "${Utils.green(botHand.name)} ${Utils.bold(botHand.action)} ${Utils.red(botHand.name)} ~ You lose ~"
+                    "${green(botHand.name)} ${bold(botHand.action)} ${red(botHand.name)} ~ You lose ~"
                 )
             }
         }
     }
 
     override fun helpResponse(bot: Mobibot, sender: String, args: String?, isPrivate: Boolean) {
-        bot.send(sender, "To play Rock Paper Scissors:")
+        bot.send(sender, bold("To play Rock Paper Scissors:"))
         bot.send(
             sender,
-            bot.helpIndent(
+            helpIndent(
                 "${bot.nick}: ${Hands.ROCK.name.toLowerCase()} or ${Hands.PAPER.name.toLowerCase()}"
                     + " or ${Hands.SCISSORS.name.toLowerCase()}"
             )
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
index 42c5057..72e1517 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
@@ -52,6 +52,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The StockQuote module.
  *
@@ -82,9 +84,10 @@ public final class StockQuote extends ThreadedModule {
         properties.put(ALPHAVANTAGE_API_KEY_PROP, "");
     }
 
-    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE", justification = "false positive?")
+    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
+                        justification = "false positive?")
     private static JSONObject getJsonResponse(final Response response, final String debugMessage)
-        throws IOException, ModuleException {
+            throws IOException, ModuleException {
         if (response.isSuccessful()) {
             if (response.body() != null) {
                 final JSONObject json = new JSONObject(Objects.requireNonNull(response.body()).string());
@@ -132,7 +135,7 @@ public final class StockQuote extends ThreadedModule {
      * @return The {@link Message} array containing the stock quote.
      * @throws ModuleException If an errors occurs.
      */
-    @SuppressWarnings({"PMD.CloseResource"})
+    @SuppressWarnings({ "PMD.CloseResource" })
     static List<Message> getQuote(final String symbol, final String apiKey) throws ModuleException {
         if (StringUtils.isBlank(apiKey)) {
             throw new ModuleException(StringUtils.capitalize(STOCK_CMD) + " is disabled. The API key is missing.");
@@ -146,7 +149,7 @@ public final class StockQuote extends ThreadedModule {
             try {
                 // Search for symbol/keywords
                 Request request = new Request.Builder().url(
-                    ALAPHAVANTAGE_URL + "SYMBOL_SEARCH&keywords=" + symbol + "&apikey=" + apiKey).build();
+                        ALAPHAVANTAGE_URL + "SYMBOL_SEARCH&keywords=" + symbol + "&apikey=" + apiKey).build();
                 Response response = client.newCall(request).execute();
 
                 JSONObject json = getJsonResponse(response, debugMessage);
@@ -161,8 +164,8 @@ public final class StockQuote extends ThreadedModule {
 
                 // Get quote for symbol
                 request = new Request.Builder().url(
-                    ALAPHAVANTAGE_URL + "GLOBAL_QUOTE&symbol=" + symbolInfo.getString("1. symbol") + "&apikey="
-                    + apiKey).build();
+                        ALAPHAVANTAGE_URL + "GLOBAL_QUOTE&symbol=" + symbolInfo.getString("1. symbol") + "&apikey="
+                        + apiKey).build();
                 response = client.newCall(request).execute();
 
                 json = getJsonResponse(response, debugMessage);
@@ -175,20 +178,21 @@ public final class StockQuote extends ThreadedModule {
                 }
 
                 messages.add(new PublicMessage(
-                    "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol")) + " [" + Utils
-                        .unescapeXml(symbolInfo.getString("2. name") + ']')));
+                        "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol")) + " [" + Utils.unescapeXml(
+                                symbolInfo.getString("2. name") + ']')));
                 messages.add(new PublicMessage("    Price:     " + Utils.unescapeXml(quote.getString("05. price"))));
-                messages.add(
-                    new PublicMessage("    Previous:  " + Utils.unescapeXml(quote.getString("08. previous close"))));
+                messages.add(new PublicMessage(
+                        "    Previous:  "
+                        + Utils.unescapeXml(quote.getString("08. previous close"))));
                 messages.add(new NoticeMessage("    Open:      " + Utils.unescapeXml(quote.getString("02. open"))));
                 messages.add(new NoticeMessage("    High:      " + Utils.unescapeXml(quote.getString("03. high"))));
                 messages.add(new NoticeMessage("    Low:       " + Utils.unescapeXml(quote.getString("04. low"))));
                 messages.add(new NoticeMessage("    Volume:    " + Utils.unescapeXml(quote.getString("06. volume"))));
                 messages.add(new NoticeMessage(
-                    "    Latest:    " + Utils.unescapeXml(quote.getString("07. latest trading day"))));
+                        "    Latest:    " + Utils.unescapeXml(quote.getString("07. latest trading day"))));
                 messages.add(new NoticeMessage(
-                    "    Change:    " + Utils.unescapeXml(quote.getString("09. change")) + " [" + Utils
-                        .unescapeXml(quote.getString("10. change percent")) + ']'));
+                        "    Change:    " + Utils.unescapeXml(quote.getString("09. change")) + " [" + Utils.unescapeXml(
+                                quote.getString("10. change percent")) + ']'));
             } catch (IOException | NullPointerException e) {
                 throw new ModuleException(debugMessage, "An error has occurred retrieving a stock quote.", e);
             }
@@ -203,8 +207,8 @@ public final class StockQuote extends ThreadedModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To retrieve a stock quote:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + STOCK_CMD + " <symbol|keywords>"));
+        bot.send(sender, bold("To retrieve a stock quote:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + STOCK_CMD + " <symbol|keywords>"));
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index 1b7af6e..f3ed606 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -33,6 +33,7 @@
 package net.thauvin.erik.mobibot.modules;
 
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.NoticeMessage;
 import twitter4j.DirectMessage;
@@ -40,6 +41,8 @@ import twitter4j.Status;
 import twitter4j.TwitterFactory;
 import twitter4j.conf.ConfigurationBuilder;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The Twitter module.
  *
@@ -115,8 +118,8 @@ public final class Twitter extends ThreadedModule {
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
         if (isEnabled()) {
-            bot.send(sender, "To post to Twitter:");
-            bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TWITTER_CMD + " <message>"));
+            bot.send(sender, bold("To post to Twitter:"));
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TWITTER_CMD + " <message>"));
         } else {
             bot.send(sender, "The Twitter posting facility is disabled.");
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 115e6ef..9d6087e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -37,6 +37,8 @@ import net.thauvin.erik.mobibot.Utils;
 
 import java.security.SecureRandom;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The War module.
  *
@@ -80,14 +82,14 @@ public final class War extends AbstractModule {
             y = r.nextInt(WAR_DECK.length);
 
             bot.send(bot.getChannel(),
-                     sender + " drew the " + Utils.bold(WAR_DECK[i]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
-            bot.action("drew the " + Utils.bold(WAR_DECK[y]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
+                     sender + " drew the " + bold(WAR_DECK[i]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
+            bot.action("drew the " + bold(WAR_DECK[y]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
 
             if (i != y) {
                 break;
             }
 
-            bot.send("This means " + Utils.bold("WAR") + '!');
+            bot.send("This means " + bold("WAR") + '!');
         }
 
         if (i < y) {
@@ -102,7 +104,7 @@ public final class War extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To play war:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + WAR_CMD));
+        bot.send(sender, bold("To play war:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WAR_CMD));
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
index 5f1a376..53822e1 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
@@ -52,6 +52,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The <code>Weather2</code> module.
  *
@@ -177,7 +179,7 @@ public class Weather2 extends ThreadedModule {
                                                                Colors.GREEN));
                             } else {
                                 final HttpUrl url = Objects.requireNonNull(HttpUrl.parse(
-                                    "https://openweathermap.org/find"))
+                                        "https://openweathermap.org/find"))
                                                            .newBuilder()
                                                            .addQueryParameter("q",
                                                                               city + ',' + country)
@@ -199,17 +201,22 @@ public class Weather2 extends ThreadedModule {
         return messages;
     }
 
+    private static String wind(final Double w) {
+        final double kmh = w * 1.60934;
+        return Math.round(w) + " mph, " + Math.round(kmh) + " km/h";
+    }
+
     /**
      * {@inheritDoc}
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To display weather information:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " <city> [, <country code>]"));
+        bot.send(sender, bold("To display weather information:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " <city> [, <country code>]"));
         bot.send(sender, "For example:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " paris, fr"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " paris, fr"));
         bot.send(sender,
-                 "The default ISO 3166 country code is " + Utils.bold("US")
+                 "The default ISO 3166 country code is " + bold("US")
                  + ". Zip codes are supported in most countries.");
     }
 
@@ -236,9 +243,4 @@ public class Weather2 extends ThreadedModule {
             helpResponse(bot, sender, args, true);
         }
     }
-
-    private static String wind(final Double w) {
-        final double kmh = w * 1.60934;
-        return Math.round(w) + " mph, " + Math.round(kmh) + " km/h";
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
index 7bbc09d..a19f33e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
@@ -35,6 +35,7 @@ package net.thauvin.erik.mobibot.modules;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.thauvin.erik.mobibot.Constants;
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 import net.thauvin.erik.mobibot.msg.ErrorMessage;
 import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.PublicMessage;
@@ -47,6 +48,8 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
+import static net.thauvin.erik.mobibot.Utils.bold;
+
 /**
  * The WorldTime module.
  *
@@ -232,11 +235,11 @@ public final class WorldTime extends AbstractModule {
      */
     @Override
     public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, "To display a country's current date/time:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TIME_CMD) + " [<country code>]");
+        bot.send(sender, bold("To display a country's current date/time:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD) + " [<country code>]");
 
-        bot.send(sender, "For a listing of the supported countries:");
-        bot.send(sender, bot.helpIndent(bot.getNick() + ": " + TIME_CMD));
+        bot.send(sender, bold("For a listing of the supported countries:"));
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD));
     }
 
     /**
diff --git a/src/test/java/net/thauvin/erik/mobibot/tell/TellMessageTest.java b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java
similarity index 98%
rename from src/test/java/net/thauvin/erik/mobibot/tell/TellMessageTest.java
rename to src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java
index 04927a8..e57c52a 100644
--- a/src/test/java/net/thauvin/erik/mobibot/tell/TellMessageTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java
@@ -30,7 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.tell;
+package net.thauvin.erik.mobibot.commands.tell;
 
 import org.testng.annotations.Test;
 
diff --git a/version.properties b/version.properties
index aa42206..30605d4 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Mar 23 23:04:40 PDT 2020
-version.buildmeta=714
+#Sat Mar 28 10:22:37 PDT 2020
+version.buildmeta=045
 version.major=0
-version.minor=7
-version.patch=3
-version.prerelease=beta
+version.minor=8
+version.patch=0
+version.prerelease=alpha
 version.project=mobibot
-version.semver=0.7.3-beta+714
+version.semver=0.8.0-alpha+045

From f7e26516196ee63bf161f18d1e44d47f7c125269 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 28 Mar 2020 13:15:28 -0700
Subject: [PATCH 002/262] Reworked versions command.

---
 .../net/thauvin/erik/mobibot/Mobibot.java     | 21 ++--
 .../net/thauvin/erik/mobibot/commands/Info.kt |  4 -
 .../erik/mobibot/commands/MobibotVersion.kt   | 64 ------------
 .../erik/mobibot/commands/Versions.java       | 98 +++++++++++++++++++
 4 files changed, 104 insertions(+), 83 deletions(-)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Versions.java

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index e695d4d..f68e272 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -38,13 +38,13 @@ import net.thauvin.erik.mobibot.commands.Cycle;
 import net.thauvin.erik.mobibot.commands.Ignore;
 import net.thauvin.erik.mobibot.commands.Info;
 import net.thauvin.erik.mobibot.commands.Me;
-import net.thauvin.erik.mobibot.commands.MobibotVersion;
 import net.thauvin.erik.mobibot.commands.Modules;
 import net.thauvin.erik.mobibot.commands.Msg;
 import net.thauvin.erik.mobibot.commands.Nick;
 import net.thauvin.erik.mobibot.commands.Recap;
 import net.thauvin.erik.mobibot.commands.Say;
 import net.thauvin.erik.mobibot.commands.Users;
+import net.thauvin.erik.mobibot.commands.Versions;
 import net.thauvin.erik.mobibot.commands.links.Comment;
 import net.thauvin.erik.mobibot.commands.links.Posting;
 import net.thauvin.erik.mobibot.commands.links.Tags;
@@ -117,19 +117,10 @@ public class Mobibot extends PircBot {
     // Info strings
     @SuppressWarnings("indentation")
     public static final List<String> INFO =
-            List.of(ReleaseInfo.PROJECT + " v" + ReleaseInfo.VERSION + " by Erik C. Thauvin (erik@thauvin.net)",
-                    "https://www.mobitopia.org/mobibot/");
-    // Version strings
-    @SuppressWarnings("indentation")
-    public static final List<String> MOBIBOT_VERSIONS =
-            List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
-                    "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
-                    + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
-                    "Runtime: " + System.getProperty("java.runtime.name") + " (build " + System.getProperty(
-                            "java.runtime.version") + ')',
-                    "VM: " + System.getProperty("java.vm.name") + " (build " + System.getProperty("java.vm.version")
-                    + ", "
-                    + System.getProperty("java.vm.info") + ')');
+            List.of(
+                    ReleaseInfo.PROJECT + " v" + ReleaseInfo.VERSION
+                    + " (" + Utils.green("https://www.mobitopia.org/mobibot/") + ')',
+                    "Written by Erik C. Thauvin (" + Utils.green("https://erik.thauvin.net/") + ')');
     // Timer
     public static final Timer timer = new Timer(true);
     // Default port
@@ -253,13 +244,13 @@ public class Mobibot extends PircBot {
         commands.add(ignoreCommand);
         commands.add(new Info());
         commands.add(new Me());
-        commands.add(new MobibotVersion());
         commands.add(new Modules());
         commands.add(new Msg());
         commands.add(new Nick());
         commands.add(new Recap());
         commands.add(new Say());
         commands.add(new Users());
+        commands.add(new Versions());
 
         // Load the links commands
         commands.add(new Comment());
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
index 7fe62e4..b1ad2ac 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
@@ -57,11 +57,7 @@ class Info : AbstractCommand() {
         isPrivate: Boolean
     ) {
         for (info in Mobibot.INFO) {
-            if (info.startsWith("https://")) {
-                bot.send(sender, info, Colors.DARK_GREEN, isPrivate)
-            } else {
                 bot.send(sender, info, isPrivate)
-            }
         }
 
         val info = StringBuilder("Uptime: ")
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt b/src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt
deleted file mode 100644
index 79c6224..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/commands/MobibotVersion.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * AbstractCommandImpl.kt
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands
-
-import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
-
-class MobibotVersion : AbstractCommand() {
-    override val command = "version"
-    override val help = listOf(
-        Utils.bold("To view the version data (bot, java, etc.):"),
-        Utils.helpIndent("/msg %s $command")
-    )
-    override val isOp = true
-    override val isPublic = false
-    override val isVisible = true
-
-    override fun commandResponse(
-        bot: Mobibot,
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (isOp) {
-            for (v in Mobibot.MOBIBOT_VERSIONS) {
-                bot.send(sender, v, isPrivate)
-            }
-        } else {
-            bot.helpDefault(sender, isOp)
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
new file mode 100644
index 0000000..064f5e9
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -0,0 +1,98 @@
+/*
+ * Version.java
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands;
+
+import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.ReleaseInfo;
+import net.thauvin.erik.mobibot.Utils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class Versions extends AbstractCommand {
+    private final List<String> versions =
+            List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
+                    "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
+                    + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
+                    "Runtime: " + System.getProperty("java.runtime.name") + " (build " + System.getProperty(
+                            "java.runtime.version") + ')',
+                    "VM: " + System.getProperty("java.vm.name") + " (build " + System.getProperty("java.vm.version")
+                    + ", "
+                    + System.getProperty("java.vm.info") + ')');
+
+    @NotNull
+    @Override
+    public String getCommand() {
+        return "versions";
+    }
+
+
+    @NotNull
+    @Override
+    public List<String> getHelp() {
+        return List.of(Utils.bold("To view the versions data (bot, java, etc.):"),
+                       Utils.helpIndent("/msg %s $command"));
+    }
+
+    @Override
+    public boolean isOp() {
+        return true;
+    }
+
+    @Override
+    public boolean isPublic() {
+        return false;
+    }
+
+    @Override
+    public boolean isVisible() {
+        return true;
+    }
+
+    @Override
+    public void commandResponse(@NotNull final Mobibot bot,
+                                @NotNull final String sender,
+                                @NotNull final String login,
+                                @NotNull final String args,
+                                final boolean isOp,
+                                final boolean isPrivate) {
+        if (isOp) {
+            for (final String v : versions) {
+                bot.send(sender, v, isPrivate);
+            }
+        } else {
+            bot.helpDefault(sender, isOp);
+        }
+
+    }
+}

From 9b2dc8587f3a072748974ca61f47ff978e615995 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 28 Mar 2020 13:17:07 -0700
Subject: [PATCH 003/262] detekt & spotbugs cleanup.

---
 config/spotbugs/excludeFilter.xml                   |  5 +++--
 detekt-baseline.xml                                 | 13 ++++++++-----
 .../net/thauvin/erik/mobibot/commands/Ignore.kt     |  4 ++--
 .../thauvin/erik/mobibot/commands/links/UrlMgr.kt   |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/config/spotbugs/excludeFilter.xml b/config/spotbugs/excludeFilter.xml
index 49bdd81..21512f0 100644
--- a/config/spotbugs/excludeFilter.xml
+++ b/config/spotbugs/excludeFilter.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FindBugsFilter
-        xmlns="https://github.com/spotbugs/filter/3.0.0"
+        xmlns="https://github.com/spotbugs/filter/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
+        xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/4.0.0/spotbugs/etc/findbugsfilter.xsd">
     <Match>
         <Or>
             <Package name="net.thauvin.erik.mobibot.*"/>
@@ -22,6 +22,7 @@
             <Class name="net.thauvin.erik.mobibot.Pinboard"/>
             <Class name="net.thauvin.erik.mobibot.FeedReader"/>
             <Class name="net.thauvin.erik.mobibot.commands.tell.Tell"/>
+            <Class name="net.thauvin.erik.mobibot.commands.Versions"/>
             <Package name="net.thauvin.erik.mobibot.modules.*"/>
             <Package name="net.thauvin.erik.mobibot.entries.*"/>
         </Or>
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 2f5da4b..51a20bd 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -2,21 +2,24 @@
 <SmellBaseline>
   <Blacklist></Blacklist>
   <Whitelist>
-    <ID>ComplexMethod:Links.kt$Links$commandResponse</ID>
+    <ID>ComplexCondition:UrlMgr.kt$UrlMgr$Ignore.isNotIgnored(sender) &amp;&amp; (cmds.size == 1 || !cmds[1].contains(bot.nick) || !cmds[1].endsWith(" (${Ignore.IGNORE_CMD}"))</ID>
+    <ID>ComplexMethod:Posting.kt$Posting$commandResponse</ID>
     <ID>ComplexMethod:UrlMgr.kt$UrlMgr$commandResponse</ID>
     <ID>ComplexMethod:View.kt$View$commandResponse</ID>
-    <ID>LongMethod:Links.kt$Links$commandResponse</ID>
+    <ID>LongMethod:Posting.kt$Posting$commandResponse</ID>
     <ID>LongMethod:UrlMgr.kt$UrlMgr$commandResponse</ID>
     <ID>LongMethod:View.kt$View$commandResponse</ID>
     <ID>LongParameterList:AbstractCommand.kt$AbstractCommand$( bot: Mobibot, sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
     <ID>LoopWithTooManyJumpStatements:View.kt$View$while (i &lt; max) { entry = getEntry(i) if (lcArgs.isNotEmpty()) { if (entry.link.toLowerCase().contains(lcArgs) || entry.title.toLowerCase().contains(lcArgs) || entry.nick.toLowerCase().contains(lcArgs)) { if (sent &gt; maxEntries) { bot.send( sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs"), isPrivate ) break } bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate) sent++ } } else { if (sent &gt; maxEntries) { bot.send( sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1}"), isPrivate ) break } bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate) sent++ } i++ }</ID>
-    <ID>MagicNumber:Comments.kt$Comments$3</ID>
+    <ID>MagicNumber:Comment.kt$Comment$3</ID>
     <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
     <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
+    <ID>MagicNumber:UrlMgr.kt$UrlMgr$1000L</ID>
+    <ID>MagicNumber:UrlMgr.kt$UrlMgr$60L</ID>
     <ID>MagicNumber:View.kt$View$8</ID>
-    <ID>NestedBlockDepth:Comments.kt$Comments$commandResponse</ID>
+    <ID>NestedBlockDepth:Comment.kt$Comment$commandResponse</ID>
     <ID>NestedBlockDepth:Ignore.kt$Ignore$commandResponse</ID>
-    <ID>NestedBlockDepth:Links.kt$Links$commandResponse</ID>
+    <ID>NestedBlockDepth:Posting.kt$Posting$commandResponse</ID>
     <ID>NestedBlockDepth:UrlMgr.kt$UrlMgr$commandResponse</ID>
     <ID>NestedBlockDepth:View.kt$View$commandResponse</ID>
   </Whitelist>
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index b67fc18..db3ab27 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -45,7 +45,7 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
         }
     }
 
-    override val command = IGNORE
+    override val command = IGNORE_CMD
     override val help = listOf(
         Utils.bold("To check your ignore status:"),
         Utils.helpIndent("%s: $command"),
@@ -57,7 +57,7 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
     override val isVisible = true
 
     companion object {
-        const val IGNORE = "ignore"
+        const val IGNORE_CMD = "ignore"
         private val ignored = HashSet<String>()
 
         @JvmStatic
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
index c1a3b37..bbd8c7a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -131,7 +131,7 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
 
         if (Ignore.isNotIgnored(sender) && (cmds.size == 1
                 || !cmds[1].contains(bot.nick)
-                || !cmds[1].endsWith(" (${Ignore.IGNORE}"))) {
+                || !cmds[1].endsWith(" (${Ignore.IGNORE_CMD}"))) {
             val link = cmds[0].trim()
             var isBackup = false
             val dupIndex: Int = findDupEntry(link)

From abbb322b5d74ac43fba153ce2291c4cb49da737b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 28 Mar 2020 15:00:56 -0700
Subject: [PATCH 004/262] Added setCommandsList method.

---
 .../net/thauvin/erik/mobibot/Mobibot.java     | 27 ++++++++++++-------
 .../thauvin/erik/mobibot/commands/Modules.kt  |  4 +--
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index f68e272..db20fd4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -650,16 +650,10 @@ public class Mobibot extends PircBot {
             Collections.sort(opsCommandsNames);
         }
 
-        // Print 6 commands per line
-        final int chunk = 6;
-        for (int i = 0; i < commandsNames.size(); i += chunk) {
-            send(sender, Utils.helpIndent(
-                    String.join(" ", commandsNames.subList(i, Math.min(commandsNames.size(), i + chunk)))));
-        }
-
+        sendCommandsList(sender, commandsNames, false);
         if (isOp) {
-            send(sender, Utils.bold("The op commands are:"));
-            send(sender, Utils.helpIndent(String.join(" ", opsCommandsNames)));
+            send(sender, Utils.bold("The op commands are:"), false);
+            sendCommandsList(sender, opsCommandsNames, false);
         }
     }
 
@@ -1015,6 +1009,20 @@ public class Mobibot extends PircBot {
         send(who, Utils.colorize(message, color), false);
     }
 
+    /**
+     * Send a formatted commands/modules, etc. list.
+     *
+     * @param nick The nick to send the list to.
+     * @param list The list to format.
+     */
+    public final void sendCommandsList(final String nick, final List<String> list, final boolean isPrivate) {
+        final int chunk = 8; // 8 commands per line.
+        for (int i = 0; i < list.size(); i += chunk) {
+            send(nick, Utils.helpIndent(
+                    String.join(" ", list.subList(i, Math.min(list.size(), i + chunk)))), isPrivate);
+        }
+    }
+
     /**
      * Sets the backlogs URL.
      *
@@ -1152,6 +1160,7 @@ public class Mobibot extends PircBot {
         twitterEntries.remove(index);
     }
 
+
     /**
      * Post all the links on twitter on shutdown.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index de494a4..2bbce85 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -58,8 +58,8 @@ class Modules : AbstractCommand() {
             if (modulesNames.isEmpty()) {
                 bot.send(sender, "There are no enabled modules.", true)
             } else {
-                bot.send(sender, Utils.bold("The enabled modules are: "))
-                bot.send(sender, Utils.helpIndent(modulesNames.joinToString(", ")))
+                bot.send(sender, Utils.bold("The enabled modules are: "), false)
+                bot.sendCommandsList(sender, modulesNames, false )
             }
         } else {
             bot.helpDefault(sender, isOp)

From 78260381cf05439b975ebeb6e463468faf3c62b4 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 28 Mar 2020 15:01:29 -0700
Subject: [PATCH 005/262] Cleaned up send() in commands.

---
 .../thauvin/erik/mobibot/commands/AbstractCommand.kt |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Info.kt   |  2 +-
 .../net/thauvin/erik/mobibot/commands/Modules.kt     |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Msg.kt    |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Users.kt  |  2 +-
 .../net/thauvin/erik/mobibot/commands/Versions.java  |  2 +-
 .../thauvin/erik/mobibot/commands/links/Comment.kt   |  4 ++--
 .../thauvin/erik/mobibot/commands/links/UrlMgr.kt    |  5 ++---
 .../net/thauvin/erik/mobibot/commands/links/View.kt  | 12 +++++-------
 9 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index aeaac2d..9d1a0cb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -53,7 +53,7 @@ abstract class AbstractCommand {
     open fun helpResponse(bot: Mobibot, command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
         if (!this.isOp || this.isOp == isOp) {
             for (h in help) {
-                bot.send(sender, String.format(h, bot.nick), isPrivate)
+                bot.send(sender, String.format(h, bot.nick))
             }
             return true
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
index b1ad2ac..9bc4715 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
@@ -83,6 +83,6 @@ class Info : AbstractCommand() {
             append(']')
         }
 
-        bot.send(sender, info.toString(), isPrivate)
+        bot.send(sender, info.toString())
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index 2bbce85..ae9492a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -56,7 +56,7 @@ class Modules : AbstractCommand() {
         if (isOp) {
             val modulesNames = bot.modulesNames
             if (modulesNames.isEmpty()) {
-                bot.send(sender, "There are no enabled modules.", true)
+                bot.send(sender, "There are no enabled modules.", isPrivate)
             } else {
                 bot.send(sender, Utils.bold("The enabled modules are: "), false)
                 bot.sendCommandsList(sender, modulesNames, false )
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
index 5c01b83..8c4cc2f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -56,7 +56,7 @@ class Msg : AbstractCommand() {
         if (isOp) {
             val msg = args.split(" ", limit = 2)
             if (args.length > 2) {
-                bot.send(msg[0], msg[1], true)
+                bot.send(msg[0], msg[1], isPrivate)
             } else {
                 helpResponse(bot, command, sender, isOp, isPrivate)
             }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index 1f0f735..acfed1d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -66,6 +66,6 @@ class Users : AbstractCommand() {
             }
         }
 
-        bot.send(sender, nicks.sorted().joinToString(" "), isPrivate)
+        bot.send(sender, nicks.sorted().joinToString(" "))
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 064f5e9..cdc15a2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -88,7 +88,7 @@ public class Versions extends AbstractCommand {
                                 final boolean isPrivate) {
         if (isOp) {
             for (final String v : versions) {
-                bot.send(sender, v, isPrivate);
+                bot.send(sender, v);
             }
         } else {
             bot.helpDefault(sender, isOp);
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 9e1138f..6f8a192 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -116,8 +116,8 @@ class Comment : AbstractCommand() {
     ): Boolean {
         if (super.helpResponse(bot, command, sender, isOp, isPrivate)) {
             if (isOp) {
-                bot.send(sender, Utils.bold("To change a comment's author:"), isPrivate)
-                bot.send(sender, Utils.helpIndent("/msg ${bot.nick} ${Constants.LINK_CMD}1.1:?<nick>"), isPrivate)
+                bot.send(sender, Utils.bold("To change a comment's author:"))
+                bot.send(sender, Utils.helpIndent("/msg ${bot.nick} ${Constants.LINK_CMD}1.1:?<nick>"))
             }
             return true
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
index bbd8c7a..02afc30 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -196,11 +196,10 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
                 }
                 saveEntries(bot, isBackup)
                 if (Constants.NO_TITLE == entry.title) {
-                    bot.send(sender, Utils.bold("Please specify a title, by typing:"), true)
+                    bot.send(sender, Utils.bold("Please specify a title, by typing:"))
                     bot.send(
                         sender,
-                        Utils.helpIndent(Constants.LINK_CMD + (index + 1) + ":|This is the title"),
-                        true
+                        Utils.helpIndent(Constants.LINK_CMD + (index + 1) + ":|This is the title")
                     )
                 }
             } else {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index e45885d..daec0f2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -101,30 +101,28 @@ class View : AbstractCommand() {
                         if (sent > maxEntries) {
                             bot.send(
                                 sender, "To view more, try: "
-                                + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs"),
-                                isPrivate
+                                + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs")
                             )
                             break
                         }
-                        bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate)
+                        bot.send(sender, EntriesUtils.buildLink(i, entry, true))
                         sent++
                     }
                 } else {
                     if (sent > maxEntries) {
                         bot.send(
                             sender,
-                            "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1}"),
-                            isPrivate
+                            "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1}")
                         )
                         break
                     }
-                    bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate)
+                    bot.send(sender, EntriesUtils.buildLink(i, entry, true))
                     sent++
                 }
                 i++
             }
         } else {
-            bot.send(sender, "There is currently nothing to view. Why don't you post something?", isPrivate)
+            bot.send(sender, "There is currently nothing to view. Why don't you post something?")
         }
     }
 }

From 887ab8c9596875262faee68e431571bff37e0af0 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 28 Mar 2020 15:27:49 -0700
Subject: [PATCH 006/262] Cleanup.

---
 src/main/java/net/thauvin/erik/mobibot/Utils.java             | 1 -
 src/main/java/net/thauvin/erik/mobibot/commands/Info.kt       | 1 -
 src/main/java/net/thauvin/erik/mobibot/commands/Versions.java | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java
index 056d216..a7ccaa4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.java
@@ -323,5 +323,4 @@ public final class Utils {
     public static String utcDateTime(final LocalDateTime date) {
         return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
     }
-
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
index 9bc4715..261e35e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
@@ -35,7 +35,6 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.links.UrlMgr
-import org.jibble.pircbot.Colors
 import java.lang.management.ManagementFactory
 
 class Info : AbstractCommand() {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index cdc15a2..077c985 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -91,7 +91,7 @@ public class Versions extends AbstractCommand {
                 bot.send(sender, v);
             }
         } else {
-            bot.helpDefault(sender, isOp);
+            bot.helpDefault(sender, false);
         }
 
     }

From f16508dae45c49a6ebcf0e556f855b7244db2325 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 28 Mar 2020 17:27:44 -0700
Subject: [PATCH 007/262] Removed unecessary breaks.

---
 .../erik/mobibot/commands/links/View.kt       | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index daec0f2..628ace6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -90,36 +90,29 @@ class View : AbstractCommand() {
                     // Do nothing
                 }
             }
+
             var entry: EntryLink
             var sent = 0
-            while (i < max) {
+            while (i < max && sent < maxEntries) {
                 entry = getEntry(i)
                 if (lcArgs.isNotEmpty()) {
                     if (entry.link.toLowerCase().contains(lcArgs)
                         || entry.title.toLowerCase().contains(lcArgs)
                         || entry.nick.toLowerCase().contains(lcArgs)) {
-                        if (sent > maxEntries) {
-                            bot.send(
-                                sender, "To view more, try: "
-                                + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs")
-                            )
-                            break
-                        }
                         bot.send(sender, EntriesUtils.buildLink(i, entry, true))
                         sent++
                     }
                 } else {
-                    if (sent > maxEntries) {
-                        bot.send(
-                            sender,
-                            "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1}")
-                        )
-                        break
-                    }
                     bot.send(sender, EntriesUtils.buildLink(i, entry, true))
                     sent++
                 }
                 i++
+                if (sent == maxEntries) {
+                    bot.send(
+                        sender,
+                        "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs")
+                    )
+                }
             }
         } else {
             bot.send(sender, "There is currently nothing to view. Why don't you post something?")

From 6bf2d6fdb13fc07c259b2537d592bc33c89d0754 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 28 Mar 2020 17:29:35 -0700
Subject: [PATCH 008/262] Updated to jdk 9 & 14, maybe.

---
 .circleci/config.yml | 12 ++++++------
 .travis.yml          | 12 +++++++-----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a20eb37..2926e9b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,19 +30,19 @@ defaults_gradle: &defaults_gradle
         path: build/reports/
 
 jobs:
-  build_gradle_jdk12:
+  build_gradle_jdk14:
     <<: *defaults
 
     docker:
-      - image: openjdk:12-jdk
+      - image: cimg/openjdk:14.0
 
     <<: *defaults_gradle
 
-  build_gradle_jdk8:
+  build_gradle_jdk9:
     <<: *defaults
 
     docker:
-      - image: circleci/openjdk:8-jdk
+      - image: circleci/openjdk:9
 
     <<: *defaults_gradle
 
@@ -50,6 +50,6 @@ workflows:
   version: 2
   gradle:
         jobs:
-        - build_gradle_jdk8
-        - build_gradle_jdk12
+        - build_gradle_jdk9
+        - build_gradle_jdk14
 
diff --git a/.travis.yml b/.travis.yml
index f8946bd..73393f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,12 @@ env:
   global:
     - CI=true
 
+matrix:
+  include:
+    - jdk: openjdk9
+    - env: JDK='OpenJDK 14'
+      install: . ./install-jdk.sh -F 14 -C
+
 install:
   - git fetch --unshallow --tags
 
@@ -12,15 +18,11 @@ addons:
   sonarcloud:
     organization: "ethauvin-github"
 
-jdk:
-  - oraclejdk8
-  - openjdk12
-
 before_install:
   - chmod +x gradlew
 
 after_success:
   - |
-      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == oraclejdk8 ]; then
+      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == oraclejdk9 ]; then
         ./gradlew sonarqube
       fi

From 4aeb17ecef7cf138eec0dec75e26d99126ee7131 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 28 Mar 2020 17:39:52 -0700
Subject: [PATCH 009/262] Trying openjdk14 and oraclejdk9.

---
 .idea/mobibot.iml                        |  2 +-
 .idea/modules/mobibot.main.iml           |  2 +-
 .idea/modules/mobibot.test.iml           |  2 +-
 .travis.yml                              | 10 ++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 7b66ece..e5aec1b 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+033" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+090" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_14" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 49a5e9b..77358ff 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+033" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+090" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index b92cc97..2ff7f88 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+033" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+090" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/.travis.yml b/.travis.yml
index 73393f2..10d46d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,6 @@ env:
   global:
     - CI=true
 
-matrix:
-  include:
-    - jdk: openjdk9
-    - env: JDK='OpenJDK 14'
-      install: . ./install-jdk.sh -F 14 -C
-
 install:
   - git fetch --unshallow --tags
 
@@ -18,6 +12,10 @@ addons:
   sonarcloud:
     organization: "ethauvin-github"
 
+jdk:
+  - oraclejdk9
+  - openjdk14
+
 before_install:
   - chmod +x gradlew
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b133221..a4b4429 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 02fae4d8e49b947ecc6893d8139681830d28015b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 29 Mar 2020 00:42:02 -0700
Subject: [PATCH 010/262] Added matches().

---
 .../erik/mobibot/entries/EntryLink.java       | 173 ++++++++++--------
 1 file changed, 93 insertions(+), 80 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
index 0365ae4..6e95c0c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
@@ -36,6 +36,7 @@ import com.rometools.rome.feed.synd.SyndCategory;
 import com.rometools.rome.feed.synd.SyndCategoryImpl;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.thauvin.erik.mobibot.Constants;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
 import java.util.Calendar;
@@ -161,16 +162,6 @@ public class EntryLink implements Serializable {
         return channel;
     }
 
-    /**
-     * Sets the channel.
-     *
-     * @param channel The channel.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    public final void setChannel(final String channel) {
-        this.channel = channel;
-    }
-
     /**
      * Returns a comment.
      *
@@ -217,15 +208,6 @@ public class EntryLink implements Serializable {
         return link;
     }
 
-    /**
-     * Sets the comment's link.
-     *
-     * @param link The new link.
-     */
-    public final void setLink(final String link) {
-        this.link = link;
-    }
-
     /**
      * Returns the comment's author login.
      *
@@ -235,16 +217,6 @@ public class EntryLink implements Serializable {
         return login;
     }
 
-    /**
-     * Sets the comment's author login.
-     *
-     * @param login The new login.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    public final void setLogin(final String login) {
-        this.login = login;
-    }
-
     /**
      * Returns the comment's author nickname.
      *
@@ -254,15 +226,6 @@ public class EntryLink implements Serializable {
         return nick;
     }
 
-    /**
-     * Sets the comment's author nickname.
-     *
-     * @param nick The new nickname.
-     */
-    public final void setNick(final String nick) {
-        this.nick = nick;
-    }
-
     /**
      * Returns the tags formatted for pinboard.in
      *
@@ -288,6 +251,96 @@ public class EntryLink implements Serializable {
         return tags;
     }
 
+    /**
+     * Returns the comment's title.
+     *
+     * @return The title.
+     */
+    public final String getTitle() {
+        return title;
+    }
+
+    /**
+     * Returns true if the entry has comments.
+     *
+     * @return true if there are comments, false otherwise.
+     */
+    public final boolean hasComments() {
+        return !comments.isEmpty();
+    }
+
+    /**
+     * Returns true if the entry has tags.
+     *
+     * @return true if there are tags, false otherwise.
+     */
+    public final boolean hasTags() {
+        return !tags.isEmpty();
+    }
+
+    /**
+     * Returns true if a string is contained in the link, title, or nick.
+     *
+     * @param match The string to match.
+     * @return {@code true} if matched, {@code false} otherwise.
+     */
+    public Boolean matches(final String match) {
+        return (StringUtils.containsIgnoreCase(link, match)
+                || StringUtils.containsIgnoreCase(title, match)
+                || StringUtils.containsIgnoreCase(nick, match));
+    }
+
+    /**
+     * Sets the channel.
+     *
+     * @param channel The channel.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public final void setChannel(final String channel) {
+        this.channel = channel;
+    }
+
+    /**
+     * /** Sets a comment.
+     *
+     * @param index   The comment's index.
+     * @param comment The actual comment.
+     * @param nick    The nickname of the author of the comment.
+     */
+    public final void setComment(final int index, final String comment, final String nick) {
+        if (index < comments.size()) {
+            comments.set(index, new EntryComment(comment, nick));
+        }
+    }
+
+    /**
+     * Sets the comment's link.
+     *
+     * @param link The new link.
+     */
+    public final void setLink(final String link) {
+        this.link = link;
+    }
+
+    /**
+     * Sets the comment's author login.
+     *
+     * @param login The new login.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public final void setLogin(final String login) {
+        this.login = login;
+    }
+
+    /**
+     * Sets the comment's author nickname.
+     *
+     * @param nick The new nickname.
+     */
+    public final void setNick(final String nick) {
+        this.nick = nick;
+    }
+
     /**
      * Sets the tags.
      *
@@ -342,15 +395,6 @@ public class EntryLink implements Serializable {
         this.tags.addAll(tags);
     }
 
-    /**
-     * Returns the comment's title.
-     *
-     * @return The title.
-     */
-    public final String getTitle() {
-        return title;
-    }
-
     /**
      * Sets the comment's title.
      *
@@ -360,37 +404,6 @@ public class EntryLink implements Serializable {
         this.title = title;
     }
 
-    /**
-     * Returns true if the entry has comments.
-     *
-     * @return true if there are comments, false otherwise.
-     */
-    public final boolean hasComments() {
-        return (!comments.isEmpty());
-    }
-
-    /**
-     * Returns true if the entry has tags.
-     *
-     * @return true if there are tags, false otherwise.
-     */
-    public final boolean hasTags() {
-        return (!tags.isEmpty());
-    }
-
-    /**
-     * /** Sets a comment.
-     *
-     * @param index   The comment's index.
-     * @param comment The actual comment.
-     * @param nick    The nickname of the author of the comment.
-     */
-    public final void setComment(final int index, final String comment, final String nick) {
-        if (index < comments.size()) {
-            comments.set(index, new EntryComment(comment, nick));
-        }
-    }
-
     /**
      * Returns a string representation of the object.
      *
@@ -400,7 +413,7 @@ public class EntryLink implements Serializable {
     public final String toString() {
 
         return super.toString() + "[ channel -> '" + channel + '\'' + ", comments -> " + comments + ", date -> " + date
-            + ", link -> '" + link + '\'' + ", login -> '" + login + '\'' + ", nick -> '" + nick + '\''
-            + ", tags -> " + tags + ", title -> '" + title + '\'' + " ]";
+               + ", link -> '" + link + '\'' + ", login -> '" + login + '\'' + ", nick -> '" + nick + '\''
+               + ", tags -> " + tags + ", title -> '" + title + '\'' + " ]";
     }
 }

From fbe36d50b7ada558ca0f8ff0145755e94d803fe1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 29 Mar 2020 00:44:10 -0700
Subject: [PATCH 011/262] Removed complexity (detekt)

---
 detekt-baseline.xml                           |  14 +-
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |   6 +-
 .../net/thauvin/erik/mobibot/Mobibot.java     |   2 +-
 .../erik/mobibot/commands/AbstractCommand.kt  |   1 -
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  96 +++++++----
 .../erik/mobibot/commands/links/Comment.kt    |  74 +++++----
 .../erik/mobibot/commands/links/Posting.kt    | 149 +++++++++--------
 .../erik/mobibot/commands/links/UrlMgr.kt     | 154 +++++++++---------
 .../erik/mobibot/commands/links/View.kt       |  97 ++++++-----
 version.properties                            |   6 +-
 10 files changed, 328 insertions(+), 271 deletions(-)

diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 51a20bd..4e8f359 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -2,25 +2,15 @@
 <SmellBaseline>
   <Blacklist></Blacklist>
   <Whitelist>
-    <ID>ComplexCondition:UrlMgr.kt$UrlMgr$Ignore.isNotIgnored(sender) &amp;&amp; (cmds.size == 1 || !cmds[1].contains(bot.nick) || !cmds[1].endsWith(" (${Ignore.IGNORE_CMD}"))</ID>
-    <ID>ComplexMethod:Posting.kt$Posting$commandResponse</ID>
-    <ID>ComplexMethod:UrlMgr.kt$UrlMgr$commandResponse</ID>
-    <ID>ComplexMethod:View.kt$View$commandResponse</ID>
-    <ID>LongMethod:Posting.kt$Posting$commandResponse</ID>
-    <ID>LongMethod:UrlMgr.kt$UrlMgr$commandResponse</ID>
-    <ID>LongMethod:View.kt$View$commandResponse</ID>
     <ID>LongParameterList:AbstractCommand.kt$AbstractCommand$( bot: Mobibot, sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
-    <ID>LoopWithTooManyJumpStatements:View.kt$View$while (i &lt; max) { entry = getEntry(i) if (lcArgs.isNotEmpty()) { if (entry.link.toLowerCase().contains(lcArgs) || entry.title.toLowerCase().contains(lcArgs) || entry.nick.toLowerCase().contains(lcArgs)) { if (sent &gt; maxEntries) { bot.send( sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs"), isPrivate ) break } bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate) sent++ } } else { if (sent &gt; maxEntries) { bot.send( sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1}"), isPrivate ) break } bot.send(sender, EntriesUtils.buildLink(i, entry, true), isPrivate) sent++ } i++ }</ID>
+    <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
+    <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
     <ID>MagicNumber:Comment.kt$Comment$3</ID>
     <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
     <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
     <ID>MagicNumber:UrlMgr.kt$UrlMgr$1000L</ID>
     <ID>MagicNumber:UrlMgr.kt$UrlMgr$60L</ID>
     <ID>MagicNumber:View.kt$View$8</ID>
-    <ID>NestedBlockDepth:Comment.kt$Comment$commandResponse</ID>
-    <ID>NestedBlockDepth:Ignore.kt$Ignore$commandResponse</ID>
-    <ID>NestedBlockDepth:Posting.kt$Posting$commandResponse</ID>
     <ID>NestedBlockDepth:UrlMgr.kt$UrlMgr$commandResponse</ID>
-    <ID>NestedBlockDepth:View.kt$View$commandResponse</ID>
   </Whitelist>
 </SmellBaseline>
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 3421c5d..00d806e 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1585416159853L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1585467573570L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "alpha";
-    public static final String BUILDMETA = "045";
-    public static final String VERSION = "0.8.0-alpha+045";
+    public static final String BUILDMETA = "105";
+    public static final String VERSION = "0.8.0-alpha+105";
 
     /**
      * Disables the default constructor.
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index db20fd4..0afd2b0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -212,7 +212,7 @@ public class Mobibot extends PircBot {
             UrlMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, ircChannel);
 
             if (logger.isDebugEnabled()) {
-                logger.debug("Last feed: {}", UrlMgr.getToday());
+                logger.debug("Last feed: {}", UrlMgr.getStartDate());
             }
         } catch (Exception e) {
             if (logger.isErrorEnabled()) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 9d1a0cb..4eeaaa8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -63,5 +63,4 @@ abstract class AbstractCommand {
     open fun matches(message: String): Boolean {
         return false
     }
-
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index db3ab27..d24ccd3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -37,7 +37,7 @@ import net.thauvin.erik.mobibot.Utils
 import java.util.*
 
 class Ignore(defaultIgnore: String) : AbstractCommand() {
-    private val keyword = "me"
+    private val me = "me"
 
     init {
         if (defaultIgnore.isNotBlank()) {
@@ -47,11 +47,20 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
 
     override val command = IGNORE_CMD
     override val help = listOf(
+        Utils.bold("To ignore a link posted to the channel:"),
+        Utils.helpIndent("https://www.foo.bar %s"),
         Utils.bold("To check your ignore status:"),
         Utils.helpIndent("%s: $command"),
         Utils.bold("To toggle your ignore status:"),
-        Utils.helpIndent("%s: $command $keyword")
+        Utils.helpIndent("%s: $command $me")
     )
+    private val helpOp = listOf(
+        Utils.bold("To ignore a link posted to the channel:"),
+        Utils.helpIndent("https://www.foo.bar %s"),
+        Utils.bold("To add/remove nicks from the ignored list:"),
+        Utils.helpIndent("/msg %s $command <nick>|$me [<nick> ...]")
+    )
+
     override val isOp = false
     override val isPublic = true
     override val isVisible = true
@@ -74,38 +83,69 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        if (isOp) {
+        if (!isOp) {
             val nick = sender.toLowerCase()
-            val isMe = args.toLowerCase().startsWith(keyword)
-            if (isMe) {
-                if (ignored.remove(nick)) {
-                    bot.send(sender, "You are no longer ignored.")
-                } else {
-                    ignored.add(nick)
-                    bot.send(sender, "You are now ignored.")
-                }
+            val isMe = args.toLowerCase().startsWith(me)
+            ignoreNick(bot, nick, isMe)
+        } else {
+            ignoreOp(bot, sender, args)
+        }
+    }
+
+    override fun helpResponse(
+        bot: Mobibot,
+        command: String,
+        sender: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ): Boolean {
+        return if (isOp) {
+            for (h in helpOp) {
+                bot.send(sender, String.format(h, bot.nick))
+            }
+            true
+        } else {
+            super.helpResponse(bot, command, sender, isOp, isPrivate)
+        }
+    }
+
+    private fun ignoreNick(bot: Mobibot, sender: String, isMe: Boolean) {
+        if (isMe) {
+            if (ignored.remove(sender)) {
+                bot.send(sender, "You are no longer ignored.")
             } else {
-                if (ignored.contains(nick)) {
-                    bot.send(sender, "You are currently ignored.")
-                } else {
-                    bot.send(sender, "You are not currently ignored.")
-                }
+                ignored.add(sender)
+                bot.send(sender, "You are now ignored.")
             }
         } else {
-            if (args.isNotEmpty()) {
-                val nicks = args.toLowerCase().split(" ")
-                for (nick in nicks) {
-                    val ignore = if (keyword == nick) {
-                        sender.toLowerCase()
-                    } else {
-                        nick
-                    }
-                    if (!ignored.remove(ignore)) {
-                        ignored.add(ignore)
-                    }
+            if (ignored.contains(sender)) {
+                bot.send(sender, "You are currently ignored.")
+            } else {
+                bot.send(sender, "You are not currently ignored.")
+            }
+        }
+    }
+
+    private fun ignoreOp(bot: Mobibot, sender: String, args: String) {
+        if (args.isNotEmpty()) {
+            val nicks = args.toLowerCase().split(" ")
+            for (nick in nicks) {
+                val ignore = if (me == nick) {
+                    nick.toLowerCase()
+                } else {
+                    nick
+                }
+                if (!ignored.remove(ignore)) {
+                    ignored.add(ignore)
                 }
             }
-            bot.send(sender, "The following nicks are ignored: ${ignored.joinToString(", ")}")
+        }
+
+        if (ignored.size > 0) {
+            bot.send(sender, Utils.bold("The following nicks are ignored:"))
+            bot.sendCommandsList(sender, ignored.toList(), false)
+        } else {
+            bot.send(sender, "No one is currently ${Utils.bold("ignored")}.")
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 6f8a192..435de45 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -71,37 +71,13 @@ class Comment : AbstractCommand() {
 
         if (index < UrlMgr.entriesCount) {
             val entry: EntryLink = UrlMgr.getEntry(index)
-            val cindex = cmds[1].toInt() - 1
-            if (cindex < entry.commentsCount) {
-                val cmd = cmds[2].trim()
-
-                // L1.1:
-                if (cmd.isEmpty()) {
-                    val comment = entry.getComment(cindex)
-                    bot.send(bot.channel, EntriesUtils.buildComment(index, cindex, comment))
-                } else if ("-" == cmd) { // L11:-
-                    entry.deleteComment(cindex)
-                    bot.send(
-                        bot.channel,
-                        "Comment ${Constants.LINK_CMD}${index + 1}.${cindex + 1} removed."
-                    )
-                    UrlMgr.saveEntries(bot, false)
-                } else if (cmd[0] == '?') { // L1.1:?<author>
-                    if (isOp) {
-                        if (cmd.length > 1) {
-                            val comment = entry.getComment(cindex)
-                            comment.nick = cmd.substring(1)
-                            bot.send(bot.channel, EntriesUtils.buildComment(index, cindex, comment))
-                            UrlMgr.saveEntries(bot, false)
-                        }
-                    } else {
-                        bot.send(sender, "Please ask a channel op to change the author of this comment for you.")
-                    }
-                } else {
-                    entry.setComment(cindex, cmd, sender)
-                    val comment = entry.getComment(cindex)
-                    bot.send(sender, EntriesUtils.buildComment(index, cindex, comment))
-                    UrlMgr.saveEntries(bot, false)
+            val commentIndex = cmds[1].toInt() - 1
+            if (commentIndex < entry.commentsCount) {
+                when (val cmd = cmds[2].trim()) {
+                    "" -> showComment(bot, entry, index, commentIndex) // L1.1:
+                    "-" -> deleteComment(bot, entry, index, commentIndex) // L11:-
+                    "?" -> changeAuthor(bot, cmd, sender, isOp, entry, index, commentIndex) // L1.1:?<author>
+                    else -> setComment(bot, cmd, sender, entry, index, commentIndex)
                 }
             }
         }
@@ -127,4 +103,40 @@ class Comment : AbstractCommand() {
     override fun matches(message: String): Boolean {
         return message.matches("^${Constants.LINK_CMD}[0-9]+\\.[0-9]+:.*".toRegex())
     }
+
+    private fun changeAuthor(
+        bot: Mobibot,
+        cmd: String,
+        sender: String,
+        isOp: Boolean,
+        entry: EntryLink,
+        index: Int,
+        commentIndex: Int
+    ) {
+        if (isOp && cmd.length > 1) {
+            val comment = entry.getComment(commentIndex)
+            comment.nick = cmd.substring(1)
+            bot.send(bot.channel, EntriesUtils.buildComment(index, commentIndex, comment))
+            UrlMgr.saveEntries(bot, false)
+        } else {
+            bot.send(sender, "Please ask a channel op to change the author of this comment for you.")
+        }
+    }
+
+    private fun deleteComment(bot: Mobibot, entry: EntryLink, index: Int, commentIndex: Int) {
+        entry.deleteComment(commentIndex)
+        bot.send(bot.channel, "Comment ${Constants.LINK_CMD}${index + 1}.${commentIndex + 1} removed.")
+        UrlMgr.saveEntries(bot, false)
+    }
+
+    private fun setComment(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int) {
+        entry.setComment(commentIndex, cmd, sender)
+        val comment = entry.getComment(commentIndex)
+        bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment))
+        UrlMgr.saveEntries(bot, false)
+    }
+
+    private fun showComment(bot: Mobibot, entry: EntryLink, index: Int, commentIndex: Int) {
+        bot.send(bot.channel, EntriesUtils.buildComment(index, commentIndex, entry.getComment(commentIndex)))
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 6d05a0e..7b9fed5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -69,74 +69,17 @@ class Posting : AbstractCommand() {
         val index = cmds[0].toInt() - 1
 
         if (index < UrlMgr.entriesCount) {
-            val cmd = cmds[1].trim()
-            if (cmd.isEmpty()) {
-                val entry: EntryLink = UrlMgr.getEntry(index)
-                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
-                if (entry.hasTags()) {
-                    bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
-                }
-                if (entry.hasComments()) {
-                    val comments = entry.comments
-                    for (i in comments.indices) {
-                        bot.send(bot.channel, EntriesUtils.buildComment(index, i, comments[i]))
+            when (val cmd = cmds[1].trim()) {
+                "" -> showEntry(bot, index)
+                "-" -> removeEntry(bot, sender, login, isOp, index) // L1:-
+                else -> {
+                    when (cmd[0]) {
+                        '|' -> changeTitle(bot, cmd, index) // L1:|<title>
+                        '=' -> changeUrl(bot, cmd, login, isOp, index) // L1:=<url>
+                        '?' -> changeAuthor(bot, cmd, sender, isOp, index) // L1:?<author>
+                        else -> addComment(bot, cmd, sender, index)
                     }
                 }
-            } else {
-                // L1:-
-                if ("-" == cmd) {
-                    val entry: EntryLink = UrlMgr.getEntry(index)
-                    if (entry.login == login || isOp) {
-                        bot.deletePin(entry)
-                        if (bot.isTwitterAutoPost) {
-                            bot.twitterRemoveEntry(index)
-                        }
-                        UrlMgr.removeEntry(index)
-                        bot.send(bot.channel, "Entry ${Constants.LINK_CMD}${index + 1} removed.")
-                        UrlMgr.saveEntries(bot, false)
-                    } else {
-                        bot.send(sender, "Please ask a channel op to remove this entry for you.")
-                    }
-                } else if (cmd[0] == '|') { // L1:|<title>
-                    if (cmd.length > 1) {
-                        val entry: EntryLink = UrlMgr.getEntry(index)
-                        entry.title = cmd.substring(1).trim()
-                        bot.updatePin(entry.link, entry)
-                        bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
-                        UrlMgr.saveEntries(bot, false)
-                    }
-                } else if (cmd[0] == '=') { // L1:=<url>
-                    val entry: EntryLink = UrlMgr.getEntry(index)
-                    if (entry.login == login || isOp) {
-                        val link = cmd.substring(1)
-                        if (link.matches(UrlMgr.LINK_MATCH.toRegex())) {
-                            val oldLink = entry.link
-                            entry.link = link
-                            bot.updatePin(oldLink, entry)
-                            bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
-                            UrlMgr.saveEntries(bot, false)
-                        }
-                    } else {
-                        bot.send(sender, "Please ask channel op to change this link for you.")
-                    }
-                } else if (cmd[0] == '?') { // L1:?<author>
-                    if (isOp) {
-                        if (cmd.length > 1) {
-                            val entry: EntryLink = UrlMgr.getEntry(index)
-                            entry.nick = cmd.substring(1)
-                            bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
-                            UrlMgr.saveEntries(bot, false)
-                        }
-                    } else {
-                        bot.send(sender, "Please ask a channel op to change the author of this link for you.")
-                    }
-                } else {
-                    val entry: EntryLink = UrlMgr.getEntry(index)
-                    val cindex = entry.addComment(cmd, sender)
-                    val comment = entry.getComment(cindex)
-                    bot.send(sender, EntriesUtils.buildComment(index, cindex, comment))
-                    UrlMgr.saveEntries(bot, false)
-                }
             }
         }
     }
@@ -144,4 +87,78 @@ class Posting : AbstractCommand() {
     override fun matches(message: String): Boolean {
         return message.matches("${Constants.LINK_CMD}[0-9]+:.*".toRegex())
     }
+
+    private fun addComment(bot: Mobibot, cmd: String, sender: String, index: Int) {
+        val entry: EntryLink = UrlMgr.getEntry(index)
+        val commentIndex = entry.addComment(cmd, sender)
+        val comment = entry.getComment(commentIndex)
+        bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment))
+        UrlMgr.saveEntries(bot, false)
+    }
+
+    private fun changeTitle(bot: Mobibot, cmd: String, index: Int) {
+        if (cmd.length > 1) {
+            val entry: EntryLink = UrlMgr.getEntry(index)
+            entry.title = cmd.substring(1).trim()
+            bot.updatePin(entry.link, entry)
+            bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+            UrlMgr.saveEntries(bot, false)
+        }
+    }
+
+    private fun changeUrl(bot: Mobibot, cmd: String, login: String, isOp: Boolean, index: Int) {
+        val entry: EntryLink = UrlMgr.getEntry(index)
+        if (entry.login == login || isOp) {
+            val link = cmd.substring(1)
+            if (link.matches(UrlMgr.LINK_MATCH.toRegex())) {
+                val oldLink = entry.link
+                entry.link = link
+                bot.updatePin(oldLink, entry)
+                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                UrlMgr.saveEntries(bot, false)
+            }
+        }
+    }
+
+    private fun changeAuthor(bot: Mobibot, cmd: String, sender: String, isOp: Boolean, index: Int) {
+        if (isOp) {
+            if (cmd.length > 1) {
+                val entry: EntryLink = UrlMgr.getEntry(index)
+                entry.nick = cmd.substring(1)
+                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                UrlMgr.saveEntries(bot, false)
+            }
+        } else {
+            bot.send(sender, "Please ask a channel op to change the author of this link for you.")
+        }
+    }
+
+    private fun removeEntry(bot: Mobibot, sender: String, login: String, isOp: Boolean, index: Int) {
+        val entry: EntryLink = UrlMgr.getEntry(index)
+        if (entry.login == login || isOp) {
+            bot.deletePin(entry)
+            if (bot.isTwitterAutoPost) {
+                bot.twitterRemoveEntry(index)
+            }
+            UrlMgr.removeEntry(index)
+            bot.send(bot.channel, "Entry ${Constants.LINK_CMD}${index + 1} removed.")
+            UrlMgr.saveEntries(bot, false)
+        } else {
+            bot.send(sender, "Please ask a channel op to remove this entry for you.")
+        }
+    }
+
+    private fun showEntry(bot: Mobibot, index: Int) {
+        val entry: EntryLink = UrlMgr.getEntry(index)
+        bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+        if (entry.hasTags()) {
+            bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+        }
+        if (entry.hasComments()) {
+            val comments = entry.comments
+            for (i in comments.indices) {
+                bot.send(bot.channel, EntriesUtils.buildComment(index, i, comments[i]))
+            }
+        }
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
index 02afc30..89519ef 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -32,7 +32,6 @@
 
 package net.thauvin.erik.mobibot.commands.links
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.TwitterTimer
@@ -44,7 +43,6 @@ import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
 import org.jsoup.Jsoup
 import java.io.IOException
-import java.util.*
 
 class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
     private val tagsKeywords = ArrayList<String>()
@@ -74,7 +72,7 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
             get() = entries.size
 
         @JvmStatic
-        var today: String = Utils.today()
+        var startDate: String = Utils.today()
             private set
 
         @JvmStatic
@@ -109,16 +107,15 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
 
         @JvmStatic
         fun startup(current: String, backlogs: String, channel: String) {
-            today = EntriesMgr.loadEntries(current, channel, entries)
-            if (Utils.today() != today) {
+            startDate = EntriesMgr.loadEntries(current, channel, entries)
+            if (Utils.today() != startDate) {
                 this.entries.clear()
-                today = Utils.today()
+                startDate = Utils.today()
             }
             EntriesMgr.loadBacklogs(backlogs, history)
         }
     }
 
-    @SuppressFBWarnings("ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD")
     override fun commandResponse(
         bot: Mobibot,
         sender: String,
@@ -129,56 +126,22 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
     ) {
         val cmds = args.split(" ".toRegex(), 2)
 
-        if (Ignore.isNotIgnored(sender) && (cmds.size == 1
-                || !cmds[1].contains(bot.nick)
-                || !cmds[1].endsWith(" (${Ignore.IGNORE_CMD}"))) {
+        if (Ignore.isNotIgnored(sender) && (cmds.size == 1 || !cmds[1].contains(bot.nick))) {
             val link = cmds[0].trim()
-            var isBackup = false
-            val dupIndex: Int = findDupEntry(link)
-            if (dupIndex == -1) {
-                if (Utils.today() != today) {
-                    isBackup = true
-                    saveEntries(bot, true)
-                    entries.clear()
-                    today = Utils.today()
-                }
+            if (!isDupEntry(bot, sender, link)) {
+                val isBackup = saveDayBackup(bot)
                 val tags: StringBuilder = StringBuilder(defaultTags)
                 var title = Constants.NO_TITLE
                 if (cmds.size == 2) {
                     val data = cmds[1].trim().split("${Tags.COMMAND}:", limit = 2)
-                    if (data.size == 1) {
-                        title = data[0].trim()
-                    } else {
-                        if (data[0].isNotBlank()) {
-                            title = data[0].trim()
-                        }
+                    title = data[0].trim()
+                    if (data.size > 1) {
                         tags.append(' ').append(data[1].trim())
                     }
                 }
-                if (Constants.NO_TITLE == title) {
-                    try {
-                        val html = Jsoup.connect(link).userAgent("Mozilla").get()
-                        val htmlTitle = html.title()
-                        if (htmlTitle.isNotBlank()) {
-                            val split = htmlTitle.split("( \\| )".toRegex(), 2)
-                            title = if (split.size == 2) {
-                                split[0]
-                            } else {
-                                htmlTitle
-                            }
-                        }
-                    } catch (ignore: IOException) {
-                        // Do nothing
-                    }
-                }
-                if (tagsKeywords.isNotEmpty()) {
-                    for (match in tagsKeywords) {
-                        val m = match.trim()
-                        if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
-                            tags.append(' ').append(m)
-                        }
-                    }
-                }
+                tags.append(matchTagKeywords(title))
+                title = fetchTitle(link, title)
+
                 entries.add(EntryLink(link, title, sender, login, bot.channel, tags.toString()))
                 val index: Int = entries.size - 1
                 val entry: EntryLink = entries[index]
@@ -188,13 +151,10 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
                 bot.addPin(entry)
 
                 // Queue link for posting to twitter
-                if (bot.isTwitterAutoPost) {
-                    bot.twitterAddEntry(index)
-                    Mobibot.timer.schedule(
-                        TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L
-                    )
-                }
+                twitterPost(bot, index)
+
                 saveEntries(bot, isBackup)
+
                 if (Constants.NO_TITLE == entry.title) {
                     bot.send(sender, Utils.bold("Please specify a title, by typing:"))
                     bot.send(
@@ -202,11 +162,6 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
                         Utils.helpIndent(Constants.LINK_CMD + (index + 1) + ":|This is the title")
                     )
                 }
-            } else {
-                val entry: EntryLink = entries[dupIndex]
-                bot.send(
-                    sender, Utils.bold("Duplicate") + " >> " + EntriesUtils.buildLink(dupIndex, entry)
-                )
             }
         }
     }
@@ -219,24 +174,69 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
         isPrivate: Boolean
     ): Boolean = false
 
-    /**
-     * Returns the index of the specified duplicate entry, if any.
-     *
-     * @param link The link.
-     * @return The index or -1 if none.
-     */
-    private fun findDupEntry(link: String): Int {
-        synchronized(entries) {
-            for (i in entries.indices) {
-                if (link == entries[i].link) {
-                    return i
-                }
-            }
-        }
-        return -1
-    }
-
     override fun matches(message: String): Boolean {
         return message.matches(LINK_MATCH.toRegex())
     }
+
+    private fun fetchTitle(link: String, title: String): String {
+        if (Constants.NO_TITLE == title) {
+            try {
+                val html = Jsoup.connect(link).userAgent("Mozilla").get()
+                val htmlTitle = html.title()
+                val split = htmlTitle.split("( \\| )".toRegex(), 2)
+                return if (split.size == 2) {
+                    split[0]
+                } else {
+                    htmlTitle
+                }
+            } catch (ignore: IOException) {
+                // Do nothing
+            }
+        }
+        return title
+    }
+
+    private fun isDupEntry(bot: Mobibot, sender: String, link: String): Boolean {
+        synchronized(entries) {
+            for (i in entries.indices) {
+                if (link == entries[i].link) {
+                    val entry: EntryLink = entries[i]
+                    bot.send(sender, Utils.bold("Duplicate") + " >> " + EntriesUtils.buildLink(i, entry))
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+    private fun matchTagKeywords(title: String): String {
+        val matches = ArrayList<String>()
+        if (tagsKeywords.isNotEmpty()) {
+            for (match in tagsKeywords) {
+                val m = match.trim()
+                if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
+                    matches.add(m)
+                }
+            }
+        }
+        return matches.joinToString(" ")
+    }
+
+    private fun saveDayBackup(bot: Mobibot): Boolean {
+        if (Utils.today() != startDate) {
+            saveEntries(bot, true)
+            entries.clear()
+            startDate = Utils.today()
+            return true
+        }
+
+        return false
+    }
+
+    private fun twitterPost(bot: Mobibot, index: Int) {
+        if (bot.isTwitterAutoPost) {
+            bot.twitterAddEntry(index)
+            Mobibot.timer.schedule(TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L)
+        }
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index 628ace6..1bf601a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -65,57 +65,56 @@ class View : AbstractCommand() {
         isPrivate: Boolean
     ) {
         if (entriesCount != 0) {
-            val max = entriesCount
-            var lcArgs = args.toLowerCase(Constants.LOCALE)
-            var i = 0
-            if (lcArgs.isEmpty() && max > maxEntries) {
-                i = max - maxEntries
-            }
-            if (lcArgs.matches("^\\d+(| .*)".toRegex())) {
-                val split = lcArgs.split(" ", limit = 2)
-                try {
-                    i = split[0].toInt()
-                    if (i > 0) {
-                        i--
-                    }
-                    lcArgs = if (split.size == 2) {
-                        split[1].trim()
-                    } else {
-                        ""
-                    }
-                    if (i > max) {
-                        i = 0
-                    }
-                } catch (ignore: NumberFormatException) {
-                    // Do nothing
-                }
-            }
-
-            var entry: EntryLink
-            var sent = 0
-            while (i < max && sent < maxEntries) {
-                entry = getEntry(i)
-                if (lcArgs.isNotEmpty()) {
-                    if (entry.link.toLowerCase().contains(lcArgs)
-                        || entry.title.toLowerCase().contains(lcArgs)
-                        || entry.nick.toLowerCase().contains(lcArgs)) {
-                        bot.send(sender, EntriesUtils.buildLink(i, entry, true))
-                        sent++
-                    }
-                } else {
-                    bot.send(sender, EntriesUtils.buildLink(i, entry, true))
-                    sent++
-                }
-                i++
-                if (sent == maxEntries) {
-                    bot.send(
-                        sender,
-                        "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs")
-                    )
-                }
-            }
+            showPosts(bot, args, sender)
         } else {
             bot.send(sender, "There is currently nothing to view. Why don't you post something?")
         }
     }
+
+    private fun showPosts(bot: Mobibot, args: String, sender: String) {
+        val max = entriesCount
+        var lcArgs = args.toLowerCase(Constants.LOCALE)
+        var i = 0
+        if (lcArgs.isEmpty() && max > maxEntries) {
+            i = max - maxEntries
+        }
+        if (lcArgs.matches("^\\d+(| .*)".toRegex())) {
+            val split = lcArgs.split(" ", limit = 2)
+            try {
+                i = split[0].toInt() - 1
+                lcArgs = if (split.size == 2) {
+                    split[1].trim()
+                } else {
+                    ""
+                }
+                if (i > max) {
+                    i = 0
+                }
+            } catch (ignore: NumberFormatException) {
+                // Do nothing
+            }
+        }
+
+        var entry: EntryLink
+        var sent = 0
+        while (i < max && sent < maxEntries) {
+            entry = getEntry(i)
+            if (lcArgs.isNotBlank()) {
+                if (entry.matches(lcArgs)) {
+                    bot.send(sender, EntriesUtils.buildLink(i, entry, true))
+                    sent++
+                }
+            } else {
+                bot.send(sender, EntriesUtils.buildLink(i, entry, true))
+                sent++
+            }
+            i++
+            if (sent == maxEntries && i < max) {
+                bot.send(
+                    sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs")
+                )
+            }
+        }
+
+    }
 }
diff --git a/version.properties b/version.properties
index 30605d4..3f02b34 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Mar 28 10:22:37 PDT 2020
-version.buildmeta=045
+#Sun Mar 29 00:39:32 PDT 2020
+version.buildmeta=105
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=alpha
 version.project=mobibot
-version.semver=0.8.0-alpha+045
+version.semver=0.8.0-alpha+105

From b7a0072db56830fb5036c0ea8a210610d41c03f5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 15:27:00 -0700
Subject: [PATCH 012/262] Updated dependencies.

---
 .idea/mobibot.iml              | 2 +-
 .idea/modules/mobibot.main.iml | 6 +++---
 .idea/modules/mobibot.test.iml | 6 +++---
 build.gradle                   | 9 +++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index e5aec1b..771bd41 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+090" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+157" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_14" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 77358ff..6f0fcd0 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+090" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+157" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.9/122c7cee69b53ed4a7681c03d4ee4c0e2765da5/commons-lang3-3.9.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -54,7 +54,7 @@
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 2ff7f88..cfdf045 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+090" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+157" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.9/122c7cee69b53ed4a7681c03d4ee4c0e2765da5/commons-lang3-3.9.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -55,7 +55,7 @@
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
diff --git a/build.gradle b/build.gradle
index d9102a2..8d75ae5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,9 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.28.0'
-    id 'com.github.spotbugs' version '4.0.4'
+    id 'com.github.spotbugs' version '4.0.5'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.7.0'
+    id 'io.gitlab.arturbosch.detekt' version '1.7.2'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
@@ -46,11 +46,12 @@ dependencies {
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
 
-    implementation 'org.apache.commons:commons-lang3:3.9'
+    implementation 'org.apache.commons:commons-lang3:3.10'
+    //implementation 'org.apache.commons:commons-text:1.8'
     implementation 'commons-cli:commons-cli:1.4'
 
     implementation 'commons-net:commons-net:3.6'
-    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.5.0-RC1'
 
     implementation 'com.rometools:rome:1.12.2'
 

From 363a7cda40544953d9b0db4c23f4383404aec552 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 15:31:58 -0700
Subject: [PATCH 013/262] Fixed convert2Diamond.

---
 src/main/java/net/thauvin/erik/mobibot/Pinboard.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java b/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
index a0f3d95..b9f538d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
@@ -80,9 +80,8 @@ class Pinboard {
      *
      * @param entry The entry to add.
      */
-    @SuppressWarnings("Convert2Diamond")
     final void addPost(final EntryLink entry) {
-        final SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+        final SwingWorker<Boolean, Void> worker = new SwingWorker<>() {
             @Override
             protected Boolean doInBackground() {
                 return pinboard.addPin(entry.getLink(),
@@ -101,11 +100,10 @@ class Pinboard {
      *
      * @param entry The entry to delete.
      */
-    @SuppressWarnings("Convert2Diamond")
     final void deletePost(final EntryLink entry) {
         final String link = entry.getLink();
 
-        final SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+        final SwingWorker<Boolean, Void> worker = new SwingWorker<>() {
             @Override
             protected Boolean doInBackground() {
                 return pinboard.deletePin(link);
@@ -141,9 +139,8 @@ class Pinboard {
      * @param oldUrl The old post URL.
      * @param entry  The entry to add.
      */
-    @SuppressWarnings("Convert2Diamond")
     final void updatePost(final String oldUrl, final EntryLink entry) {
-        final SwingWorker<Boolean, Void> worker = new SwingWorker<Boolean, Void>() {
+        final SwingWorker<Boolean, Void> worker = new SwingWorker<>() {
             @Override
             protected Boolean doInBackground() {
                 if (!oldUrl.equals(entry.getLink())) {

From 89eac6b0254e8d116370def8513e7403339ba22b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 15:38:43 -0700
Subject: [PATCH 014/262] Fixed isPrivate() and bold() usage.

---
 .../net/thauvin/erik/mobibot/FeedReader.java  |  10 +-
 .../net/thauvin/erik/mobibot/Mobibot.java     | 129 +++++++++---------
 .../java/net/thauvin/erik/mobibot/Utils.java  |  14 +-
 .../erik/mobibot/commands/AbstractCommand.kt  |   7 +-
 .../thauvin/erik/mobibot/commands/Cycle.kt    |   8 +-
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  40 +++---
 .../net/thauvin/erik/mobibot/commands/Info.kt |   6 +-
 .../net/thauvin/erik/mobibot/commands/Me.kt   |   6 +-
 .../thauvin/erik/mobibot/commands/Modules.kt  |  10 +-
 .../net/thauvin/erik/mobibot/commands/Msg.kt  |   6 +-
 .../net/thauvin/erik/mobibot/commands/Nick.kt |   6 +-
 .../thauvin/erik/mobibot/commands/Recap.kt    |   7 +-
 .../net/thauvin/erik/mobibot/commands/Say.kt  |   8 +-
 .../thauvin/erik/mobibot/commands/Users.kt    |   6 +-
 .../erik/mobibot/commands/Versions.java       |   8 +-
 .../erik/mobibot/commands/links/Comment.kt    |  48 ++++---
 .../erik/mobibot/commands/links/Posting.kt    |  34 ++---
 .../erik/mobibot/commands/links/Tags.kt       |  10 +-
 .../erik/mobibot/commands/links/UrlMgr.kt     |  13 +-
 .../erik/mobibot/commands/links/View.kt       |  12 +-
 .../erik/mobibot/commands/tell/Tell.java      |  63 +++++----
 .../erik/mobibot/modules/AbstractModule.java  |   7 +-
 .../thauvin/erik/mobibot/modules/Calc.java    |  12 +-
 .../thauvin/erik/mobibot/modules/Dice.java    |   8 +-
 .../erik/mobibot/modules/GoogleSearch.java    |  16 +--
 .../thauvin/erik/mobibot/modules/Joke.java    |  14 +-
 .../thauvin/erik/mobibot/modules/Lookup.java  |  10 +-
 .../thauvin/erik/mobibot/modules/Ping.java    |   8 +-
 .../erik/mobibot/modules/ThreadedModule.java  |  10 +-
 .../thauvin/erik/mobibot/modules/Twitter.java |  17 ++-
 .../net/thauvin/erik/mobibot/modules/War.java |  11 +-
 31 files changed, 292 insertions(+), 272 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
index 6f52e3a..99c68bd 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
@@ -89,20 +89,20 @@ class FeedReader implements Runnable {
             SyndEntry item;
             final List<SyndEntry> items = feed.getEntries();
             if (items.isEmpty()) {
-                bot.send(sender, "There is currently nothing to view. Why don't you post something?");
+                bot.send(sender, "There is currently nothing to view. Why don't you post something?", false);
             } else {
                 for (int i = 0; (i < items.size()) && (i < MAX_ITEMS); i++) {
                     item = items.get(i);
-                    bot.send(sender, item.getTitle());
-                    bot.send(sender, TAB_INDENT + Utils.green(item.getLink()));
+                    bot.send(sender, item.getTitle(), false);
+                    bot.send(sender, TAB_INDENT + Utils.green(item.getLink()), false);
                 }
             }
         } catch (MalformedURLException e) {
             bot.getLogger().debug("Invalid feed URL.", e);
-            bot.send(sender, "The feed URL is invalid.");
+            bot.send(sender, "The feed URL is invalid.", false);
         } catch (Exception e) {
             bot.getLogger().debug("Unable to fetch the feed.", e);
-            bot.send(sender, "An error has occurred while fetching the feed: " + e.getMessage());
+            bot.send(sender, "An error has occurred while fetching the feed: " + e.getMessage(), false);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 0afd2b0..63a6e4d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -482,13 +482,13 @@ public class Mobibot extends PircBot {
     /**
      * Responds with the title and links from the RSS feed.
      *
-     * @param sender The nick of the person who sent the private message.
+     * @param sender The nick of the person who sent the message.
      */
     private void feedResponse(final String sender) {
         if (isNotBlank(feedUrl)) {
             new Thread(new FeedReader(this, sender, feedUrl)).start();
         } else {
-            send(sender, "There is no weblog setup for this channel.");
+            send(sender, "There is no weblog setup for this channel.", false);
         }
     }
 
@@ -597,14 +597,15 @@ public class Mobibot extends PircBot {
     /**
      * Responds with the commands help, if any.
      *
-     * @param sender The nick of the person requesting Constants.
-     * @param topic  The help topic.
+     * @param sender    The nick of the person requesting Constants.
+     * @param topic     The help topic.
+     * @param isPrivate The private flag.
      * @return {@code true} if the topic was found, {@code false} otherwise.
      */
-    private boolean helpCommands(final String sender, final String topic) {
+    private boolean helpCommands(final String sender, final String topic, final boolean isPrivate) {
         for (final AbstractCommand command : commands) {
             if (command.isVisible() && command.getCommand().startsWith(topic)) {
-                return command.helpResponse(this, topic, sender, isOp(sender), true);
+                return command.helpResponse(this, topic, sender, isOp(sender), isPrivate);
             }
         }
         return false;
@@ -613,14 +614,18 @@ public class Mobibot extends PircBot {
     /**
      * Responds with the default Constants.
      *
-     * @param sender The nick of the person requesting Constants.
-     * @param isOp   The channel operator flag.
+     * @param sender    The nick of the person requesting Constants.
+     * @param isOp      The channel operator flag.
+     * @param isPrivate The private flag.
      */
-    public void helpDefault(final String sender, final boolean isOp) {
-        send(sender, Utils.bold("Type a URL on " + ircChannel + " to post it."));
-        send(sender, "For more information on a specific command, type:");
-        send(sender, Utils.helpIndent(getNick() + ": " + Constants.HELP_CMD + " <command>"));
-        send(sender, Utils.bold("The commands are:"));
+    public void helpDefault(final String sender, final boolean isOp, final boolean isPrivate) {
+        send(sender, "Type a URL on " + ircChannel + " to post it.", isPrivate);
+        send(sender, "For more information on a specific command, type:", isPrivate);
+        send(sender,
+             Utils.helpIndent(
+                     ((isPrivate) ? "/msg " + getNick() : getNick() + ':') + " " + Constants.HELP_CMD + " <command>"),
+             isPrivate);
+        send(sender, "The commands are:", isPrivate);
 
         if (commandsNames.isEmpty()) {
             // Feed command
@@ -650,26 +655,29 @@ public class Mobibot extends PircBot {
             Collections.sort(opsCommandsNames);
         }
 
-        sendCommandsList(sender, commandsNames, false);
+        sendCommandsList(sender, commandsNames, 8, isPrivate, true);
         if (isOp) {
-            send(sender, Utils.bold("The op commands are:"), false);
-            sendCommandsList(sender, opsCommandsNames, false);
+            send(sender, "The op commands are:", isPrivate);
+            sendCommandsList(sender, opsCommandsNames, 8, isPrivate, true);
         }
     }
 
     /**
      * Responds with the modules help, if any.
      *
-     * @param sender The nick of the person requesting Constants.
-     * @param topic  The help topic.
+     * @param sender    The nick of the person requesting Constants.
+     * @param topic     The help topic.
+     * @param isPrivate The private flag.
      * @return {@code true} if the topic was found, {@code false} otherwise.
      */
-    private boolean helpModules(final String sender, final String topic) {
+    private boolean helpModules(final String sender, final String topic, final boolean isPrivate) {
         for (final AbstractModule module : modules) {
-            for (final String cmd : module.getCommands()) {
-                if (topic.equals(cmd)) {
-                    module.helpResponse(this, sender, topic, true);
-                    return true;
+            if (module.isEnabled()) {
+                for (final String cmd : module.getCommands()) {
+                    if (topic.equals(cmd)) {
+                        module.helpResponse(this, sender, isPrivate);
+                        return true;
+                    }
                 }
             }
         }
@@ -679,24 +687,25 @@ public class Mobibot extends PircBot {
     /**
      * Responds with the bot's Constants.
      *
-     * @param sender The nick of the person who sent the private message.
-     * @param topic  The help topic, if any.
+     * @param sender    The nick of the person who sent the private message.
+     * @param topic     The help topic, if any.
+     * @param isPrivate The private flag.
      */
-    private void helpResponse(final String sender, final String topic) {
+    private void helpResponse(final String sender, final String topic, final boolean isPrivate) {
         final boolean isOp = isOp(sender);
         if (StringUtils.isBlank(topic)) {
-            helpDefault(sender, isOp);
+            helpDefault(sender, isOp, isPrivate);
         } else {
             final String lcTopic = topic.toLowerCase(Constants.LOCALE).trim();
             if (lcTopic.equals(getChannelName())) {
-                send(sender, Utils.bold("To list the last 5 posts from the channel's weblog:"));
-                send(sender, Utils.helpIndent(getNick() + ": " + getChannelName()));
+                send(sender, "To list the last 5 posts from the channel's weblog:", isPrivate);
+                send(sender, Utils.helpIndent(getNick() + ": " + getChannelName()), isPrivate);
             } else if (Tell.TELL_CMD.equals(lcTopic) && tell.isEnabled()) {
-                tell.helpResponse(sender);
+                tell.helpResponse(sender, isPrivate);
             } else {
                 // Command, Modules or Default
-                if (!helpCommands(sender, topic) && !helpModules(sender, lcTopic)) {
-                    helpDefault(sender, isOp);
+                if (!helpCommands(sender, topic, isPrivate) && !helpModules(sender, lcTopic, isPrivate)) {
+                    helpDefault(sender, isOp, isPrivate);
                 }
             }
         }
@@ -782,11 +791,11 @@ public class Mobibot extends PircBot {
             }
 
             if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
-                helpResponse(sender, args);
+                helpResponse(sender, args, false);
             } else if (cmd.equalsIgnoreCase(getChannelName())) { // mobibot: <channel>
                 feedResponse(sender);
             } else if (cmd.startsWith(Tell.TELL_CMD) && tell.isEnabled()) { // mobibot: tell
-                tell.response(sender, args);
+                tell.response(sender, args, false);
             } else {
                 boolean skip = false;
                 // Commands
@@ -850,12 +859,12 @@ public class Mobibot extends PircBot {
         final boolean isOp = isOp(sender);
 
         if (cmd.startsWith(Constants.HELP_CMD)) {
-            helpResponse(sender, args);
+            helpResponse(sender, args, true);
         } else if (isOp && "kill".equals(cmd)) {
             sendRawLine("QUIT : Poof!");
             System.exit(0);
         } else if (isOp && Constants.DIE_CMD.equals(cmd)) {
-            send(ircChannel, sender + " has just signed my death sentence.");
+            send(sender + " has just signed my death sentence.");
             timer.cancel();
             twitterShutdown();
             twitterNotification("killed by  " + sender + " on " + ircChannel);
@@ -870,10 +879,10 @@ public class Mobibot extends PircBot {
                 UrlMgr.addHistory(0, args);
                 send(sender, UrlMgr.getHistory().toString(), true);
             } else {
-                send(sender, "The specified log could not be found.");
+                send(sender, "The specified log could not be found.", true);
             }
         } else if (Tell.TELL_CMD.equals(cmd) && tell.isEnabled()) {
-            tell.response(sender, args);
+            tell.response(sender, args, true);
         } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) {
             if (logger.isDebugEnabled()) {
                 Configurator.setLevel(logger.getName(), loggerLevel);
@@ -898,7 +907,7 @@ public class Mobibot extends PircBot {
                     }
                 }
             }
-            helpDefault(sender, isOp);
+            helpDefault(sender, isOp, true);
         }
     }
 
@@ -961,20 +970,10 @@ public class Mobibot extends PircBot {
      * @param notice The notice message.
      */
     public final void send(final String notice) {
-        send(getChannel(), notice);
+        send(getChannel(), notice, false);
 
     }
 
-    /**
-     * Sends a message.
-     *
-     * @param who     The channel or nick of the person who sent the command.
-     * @param message The actual message.
-     */
-    public final void send(final String who, final String message) {
-        send(who, message, false);
-    }
-
     /**
      * Sends a message.
      *
@@ -997,29 +996,23 @@ public class Mobibot extends PircBot {
         send(who, Utils.colorize(message, color), isPrivate);
     }
 
-    /**
-     * Sends a message.
-     *
-     * @param who     The channel or nick of the person who sent the command.
-     * @param message The actual message.
-     * @param color   The message's color.
-     */
-    @SuppressWarnings("unused")
-    public final void send(final String who, final String message, final String color) {
-        send(who, Utils.colorize(message, color), false);
-    }
-
     /**
      * Send a formatted commands/modules, etc. list.
      *
-     * @param nick The nick to send the list to.
-     * @param list The list to format.
+     * @param nick      The nick to send the list to.
+     * @param list      The list to format.
+     * @param size      The number of items per line.
+     * @param isPrivate The private flag.
+     * @param isBold    The bold flag
      */
-    public final void sendCommandsList(final String nick, final List<String> list, final boolean isPrivate) {
-        final int chunk = 8; // 8 commands per line.
-        for (int i = 0; i < list.size(); i += chunk) {
+    public final void sendCommandsList(final String nick,
+                                       final List<String> list,
+                                       final int size,
+                                       final boolean isPrivate,
+                                       final boolean isBold) {
+        for (int i = 0; i < list.size(); i += size) {
             send(nick, Utils.helpIndent(
-                    String.join(" ", list.subList(i, Math.min(list.size(), i + chunk)))), isPrivate);
+                    String.join(" ", list.subList(i, Math.min(list.size(), i + size))), isBold), isPrivate);
         }
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java
index a7ccaa4..67c81c8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.java
@@ -164,9 +164,21 @@ public final class Utils {
      *
      * @param help The help string.
      * @return The indented help string.
+     * @see #helpIndent(String, boolean)
      */
     public static String helpIndent(final String help) {
-        return "        " + help;
+        return helpIndent(help, true);
+    }
+
+    /**
+     * Returns indented help string.
+     *
+     * @param help   The help string.
+     * @param isBold The bold flag.
+     * @return The indented help string.
+     */
+    public static String helpIndent(final String help, final boolean isBold) {
+        return "      " + (isBold ? bold(help) : help);
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 4eeaaa8..4b42bc3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -53,7 +53,12 @@ abstract class AbstractCommand {
     open fun helpResponse(bot: Mobibot, command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
         if (!this.isOp || this.isOp == isOp) {
             for (h in help) {
-                bot.send(sender, String.format(h, bot.nick))
+                if (isPrivate) {
+                    bot.send(sender, String.format(h, "/msg ${bot.nick}"), true)
+                } else if (isPublic) {
+                    bot.send(sender, String.format(h, "${bot.nick}:"), false)
+                }
+
             }
             return true
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
index fa18a1b..73c2d7c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -39,8 +39,8 @@ class Cycle : AbstractCommand() {
     private val wait = 10
     override val command = "cycle"
     override val help = listOf(
-        Utils.bold("To have the bot leave the channel and come back:"),
-        Utils.helpIndent("/msg %s $command")
+       "To have the bot leave the channel and come back:",
+        Utils.helpIndent("%s $command")
     )
     override val isOp = true
     override val isPublic = false
@@ -56,13 +56,13 @@ class Cycle : AbstractCommand() {
         isPrivate: Boolean
     ) {
         if (isOp) {
-            bot.send(bot.channel, "$sender has just asked me to leave. I'll be back!")
+            bot.send("$sender has just asked me to leave. I'll be back!")
             bot.sleep(wait)
             bot.partChannel(bot.channel)
             bot.sleep(wait)
             bot.joinChannel(bot.channel)
         } else {
-            bot.helpDefault(sender, isOp)
+            bot.helpDefault(sender, isOp, isPrivate)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index d24ccd3..6ad42ab 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -47,18 +47,18 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
 
     override val command = IGNORE_CMD
     override val help = listOf(
-        Utils.bold("To ignore a link posted to the channel:"),
+        "To ignore a link posted to the channel:",
         Utils.helpIndent("https://www.foo.bar %s"),
-        Utils.bold("To check your ignore status:"),
-        Utils.helpIndent("%s: $command"),
-        Utils.bold("To toggle your ignore status:"),
-        Utils.helpIndent("%s: $command $me")
+        "To check your ignore status:",
+        Utils.helpIndent("%s $command"),
+        "To toggle your ignore status:",
+        Utils.helpIndent("%s $command $me")
     )
     private val helpOp = listOf(
-        Utils.bold("To ignore a link posted to the channel:"),
+        "To ignore a link posted to the channel:",
         Utils.helpIndent("https://www.foo.bar %s"),
-        Utils.bold("To add/remove nicks from the ignored list:"),
-        Utils.helpIndent("/msg %s $command <nick>|$me [<nick> ...]")
+        "To add/remove nicks from the ignored list:",
+        Utils.helpIndent("%s $command <nick>|$me [<nick> ...]")
     )
 
     override val isOp = false
@@ -86,9 +86,9 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
         if (!isOp) {
             val nick = sender.toLowerCase()
             val isMe = args.toLowerCase().startsWith(me)
-            ignoreNick(bot, nick, isMe)
+            ignoreNick(bot, nick, isMe, isPrivate)
         } else {
-            ignoreOp(bot, sender, args)
+            ignoreOp(bot, sender, args, isPrivate)
         }
     }
 
@@ -101,7 +101,7 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
     ): Boolean {
         return if (isOp) {
             for (h in helpOp) {
-                bot.send(sender, String.format(h, bot.nick))
+                bot.send(sender, String.format(h, bot.nick), isPrivate)
             }
             true
         } else {
@@ -109,24 +109,24 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
         }
     }
 
-    private fun ignoreNick(bot: Mobibot, sender: String, isMe: Boolean) {
+    private fun ignoreNick(bot: Mobibot, sender: String, isMe: Boolean, isPrivate: Boolean) {
         if (isMe) {
             if (ignored.remove(sender)) {
-                bot.send(sender, "You are no longer ignored.")
+                bot.send(sender, "You are no longer ignored.", isPrivate)
             } else {
                 ignored.add(sender)
-                bot.send(sender, "You are now ignored.")
+                bot.send(sender, "You are now ignored.", isPrivate)
             }
         } else {
             if (ignored.contains(sender)) {
-                bot.send(sender, "You are currently ignored.")
+                bot.send(sender, "You are currently ignored.", isPrivate)
             } else {
-                bot.send(sender, "You are not currently ignored.")
+                bot.send(sender, "You are not currently ignored.", isPrivate)
             }
         }
     }
 
-    private fun ignoreOp(bot: Mobibot, sender: String, args: String) {
+    private fun ignoreOp(bot: Mobibot, sender: String, args: String, isPrivate: Boolean) {
         if (args.isNotEmpty()) {
             val nicks = args.toLowerCase().split(" ")
             for (nick in nicks) {
@@ -142,10 +142,10 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
         }
 
         if (ignored.size > 0) {
-            bot.send(sender, Utils.bold("The following nicks are ignored:"))
-            bot.sendCommandsList(sender, ignored.toList(), false)
+            bot.send(sender, "The following nicks are ignored:", isPrivate)
+            bot.sendCommandsList(sender, ignored.toList(), 8, isPrivate, true)
         } else {
-            bot.send(sender, "No one is currently ${Utils.bold("ignored")}.")
+            bot.send(sender, "No one is currently ${Utils.bold("ignored")}.", isPrivate)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
index 261e35e..8c1969c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
@@ -40,8 +40,8 @@ import java.lang.management.ManagementFactory
 class Info : AbstractCommand() {
     override val command = "info"
     override val help = listOf(
-        Utils.bold("To view information about the bot:"),
-        Utils.helpIndent("%s: $command")
+        "To view information about the bot:",
+        Utils.helpIndent("%s $command")
     )
     override val isOp = false
     override val isPublic = true
@@ -82,6 +82,6 @@ class Info : AbstractCommand() {
             append(']')
         }
 
-        bot.send(sender, info.toString())
+        bot.send(sender, info.toString(), isPrivate)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
index a229009..75e4c1f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
@@ -38,8 +38,8 @@ import net.thauvin.erik.mobibot.Utils
 class Me : AbstractCommand() {
     override val command = "me"
     override val help = listOf(
-        Utils.bold("To have the bot perform an action:"),
-        Utils.helpIndent("/msg %s $command <action>")
+        "To have the bot perform an action:",
+        Utils.helpIndent("%s $command <action>")
     )
     override val isOp = true
     override val isPublic = false
@@ -56,7 +56,7 @@ class Me : AbstractCommand() {
         if (isOp) {
             bot.action(args)
         } else {
-            bot.helpDefault(sender, isOp)
+            bot.helpDefault(sender, isOp, isPrivate)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index ae9492a..d14f437 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -38,8 +38,8 @@ import net.thauvin.erik.mobibot.Utils
 class Modules : AbstractCommand() {
     override val command = "modules"
     override val help = listOf(
-        Utils.bold("To view a list of enabled modules:"),
-        Utils.helpIndent("/msg %s $command")
+        "To view a list of enabled modules:",
+        Utils.helpIndent("%s $command")
     )
     override val isOp = true
     override val isPublic = false
@@ -58,11 +58,11 @@ class Modules : AbstractCommand() {
             if (modulesNames.isEmpty()) {
                 bot.send(sender, "There are no enabled modules.", isPrivate)
             } else {
-                bot.send(sender, Utils.bold("The enabled modules are: "), false)
-                bot.sendCommandsList(sender, modulesNames, false )
+                bot.send(sender, "The enabled modules are: ", isPrivate)
+                bot.sendCommandsList(sender, modulesNames, 7, isPrivate, false)
             }
         } else {
-            bot.helpDefault(sender, isOp)
+            bot.helpDefault(sender, isOp, isPrivate)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
index 8c4cc2f..a65ef5c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -38,8 +38,8 @@ import net.thauvin.erik.mobibot.Utils
 class Msg : AbstractCommand() {
     override val command = "msg"
     override val help = listOf(
-        Utils.bold("To have the bot send a private message to someone:"),
-        Utils.helpIndent("/msg %s $command <nick> <text>")
+        "To have the bot send a private message to someone:",
+        Utils.helpIndent("%s $command <nick> <text>")
     )
     override val isOp = true
     override val isPublic = true
@@ -61,7 +61,7 @@ class Msg : AbstractCommand() {
                 helpResponse(bot, command, sender, isOp, isPrivate)
             }
         } else {
-            bot.helpDefault(sender, isOp)
+            bot.helpDefault(sender, isOp, isPrivate)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
index 41396ed..1ab8256 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -38,8 +38,8 @@ import net.thauvin.erik.mobibot.Utils
 class Nick : AbstractCommand() {
     override val command = "nick"
     override val help = listOf(
-        Utils.bold("To change the bot's nickname:"),
-        Utils.helpIndent("/msg %s $command <nick>")
+        "To change the bot's nickname:",
+        Utils.helpIndent("%s $command <nick>")
     )
     override val isOp = true
     override val isPublic = true
@@ -56,7 +56,7 @@ class Nick : AbstractCommand() {
         if (isOp) {
             bot.changeNick(args)
         } else {
-            bot.helpDefault(sender, isOp)
+            bot.helpDefault(sender, isOp, isPrivate)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
index 2ffc255..c6c690a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -41,9 +41,8 @@ import java.util.*
 class Recap : AbstractCommand() {
     override val command = "recap"
     override val help = listOf(
-        Utils.bold("To list the last 10 public channel messages:"),
-        Utils.helpIndent("%s: $command"),
-        Utils.helpIndent("/msg %s $command")
+        "To list the last 10 public channel messages:",
+        Utils.helpIndent("%s $command")
     )
     override val isOp = false
     override val isPublic = true
@@ -89,7 +88,7 @@ class Recap : AbstractCommand() {
                 bot.send(sender, r, isPrivate)
             }
         } else {
-            bot.send(sender, "Sorry, nothing to recap.", true)
+            bot.send(sender, "Sorry, nothing to recap.", isPrivate)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
index c0b1e79..1ddb5d7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
@@ -38,8 +38,8 @@ import net.thauvin.erik.mobibot.Utils
 class Say : AbstractCommand() {
     override val command = "say"
     override val help = listOf(
-        Utils.bold("To have the bot say something on the channel:"),
-        Utils.helpIndent("/msg %s $command <text>")
+        "To have the bot say something on the channel:",
+        Utils.helpIndent("%s $command <text>")
     )
     override val isOp = true
     override val isPublic = false
@@ -55,9 +55,9 @@ class Say : AbstractCommand() {
         isPrivate: Boolean
     ) {
         if (isOp) {
-            bot.send(bot.channel, args, true)
+            bot.send(args)
         } else {
-            bot.helpDefault(sender, isOp)
+            bot.helpDefault(sender, isOp, isPrivate)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index acfed1d..fad7358 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -40,8 +40,8 @@ import java.util.*
 class Users : AbstractCommand() {
     override val command = "users"
     override val help = listOf(
-        Utils.bold("To list the users present on the channel:"),
-        Utils.helpIndent("/msg %s $command")
+        "To list the users present on the channel:",
+        Utils.helpIndent("%s $command")
     )
     override val isOp = false
     override val isPublic = true
@@ -66,6 +66,6 @@ class Users : AbstractCommand() {
             }
         }
 
-        bot.send(sender, nicks.sorted().joinToString(" "))
+        bot.send(sender, nicks.sorted().joinToString(" "), isPrivate)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 077c985..91f0044 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -60,8 +60,8 @@ public class Versions extends AbstractCommand {
     @NotNull
     @Override
     public List<String> getHelp() {
-        return List.of(Utils.bold("To view the versions data (bot, java, etc.):"),
-                       Utils.helpIndent("/msg %s $command"));
+        return List.of("To view the versions data (bot, java, etc.):",
+                       Utils.helpIndent("%s " + getCommand()));
     }
 
     @Override
@@ -88,10 +88,10 @@ public class Versions extends AbstractCommand {
                                 final boolean isPrivate) {
         if (isOp) {
             for (final String v : versions) {
-                bot.send(sender, v);
+                bot.send(sender, v, isPrivate);
             }
         } else {
-            bot.helpDefault(sender, false);
+            bot.helpDefault(sender, false, isPrivate);
         }
 
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 435de45..db996fc 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -42,12 +42,12 @@ import net.thauvin.erik.mobibot.entries.EntryLink
 class Comment : AbstractCommand() {
     override val command = COMMAND
     override val help = listOf(
-        Utils.bold("To add a comment:"),
+        "To add a comment:",
         Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
         "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
-        Utils.bold("To edit a comment, use its label: "),
+        "To edit a comment, use its label: ",
         Utils.helpIndent("${Constants.LINK_CMD}1.1:This is an edited comment"),
-        Utils.bold("To delete a comment, use its label and a minus sign: "),
+        "To delete a comment, use its label and a minus sign: ",
         Utils.helpIndent("${Constants.LINK_CMD}1.1:-")
     )
     override val isOp = false
@@ -75,9 +75,14 @@ class Comment : AbstractCommand() {
             if (commentIndex < entry.commentsCount) {
                 when (val cmd = cmds[2].trim()) {
                     "" -> showComment(bot, entry, index, commentIndex) // L1.1:
-                    "-" -> deleteComment(bot, entry, index, commentIndex) // L11:-
-                    "?" -> changeAuthor(bot, cmd, sender, isOp, entry, index, commentIndex) // L1.1:?<author>
-                    else -> setComment(bot, cmd, sender, entry, index, commentIndex)
+                    "-" -> deleteComment(bot, sender, isOp, entry, index, commentIndex) // L11:-
+                    else -> {
+                        if (cmd.startsWith('?')) {  // L1.1:?<author>
+                            changeAuthor(bot, cmd, sender, isOp, entry, index, commentIndex)
+                        } else { // L1.1:<comment>
+                            setComment(bot, cmd, sender, entry, index, commentIndex)
+                        }
+                    }
                 }
             }
         }
@@ -92,8 +97,8 @@ class Comment : AbstractCommand() {
     ): Boolean {
         if (super.helpResponse(bot, command, sender, isOp, isPrivate)) {
             if (isOp) {
-                bot.send(sender, Utils.bold("To change a comment's author:"))
-                bot.send(sender, Utils.helpIndent("/msg ${bot.nick} ${Constants.LINK_CMD}1.1:?<nick>"))
+                bot.send(sender, "To change a comment's author:", isPrivate)
+                bot.send(sender, Utils.helpIndent("/msg ${bot.nick} ${Constants.LINK_CMD}1.1:?<nick>"), isPrivate)
             }
             return true
         }
@@ -116,27 +121,38 @@ class Comment : AbstractCommand() {
         if (isOp && cmd.length > 1) {
             val comment = entry.getComment(commentIndex)
             comment.nick = cmd.substring(1)
-            bot.send(bot.channel, EntriesUtils.buildComment(index, commentIndex, comment))
+            bot.send(EntriesUtils.buildComment(index, commentIndex, comment))
             UrlMgr.saveEntries(bot, false)
         } else {
-            bot.send(sender, "Please ask a channel op to change the author of this comment for you.")
+            bot.send(sender, "Please ask a channel op to change the author of this comment for you.", false)
         }
     }
 
-    private fun deleteComment(bot: Mobibot, entry: EntryLink, index: Int, commentIndex: Int) {
-        entry.deleteComment(commentIndex)
-        bot.send(bot.channel, "Comment ${Constants.LINK_CMD}${index + 1}.${commentIndex + 1} removed.")
-        UrlMgr.saveEntries(bot, false)
+    private fun deleteComment(
+        bot: Mobibot,
+        sender: String,
+        isOp: Boolean,
+        entry: EntryLink,
+        index: Int,
+        commentIndex: Int
+    ) {
+        if (isOp || sender == entry.getComment(commentIndex).nick) {
+            entry.deleteComment(commentIndex)
+            bot.send("Comment ${Constants.LINK_CMD}${index + 1}.${commentIndex + 1} removed.")
+            UrlMgr.saveEntries(bot, false)
+        } else {
+            bot.send(sender, "Please ask a channel op to delete this comment for you.", false)
+        }
     }
 
     private fun setComment(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int) {
         entry.setComment(commentIndex, cmd, sender)
         val comment = entry.getComment(commentIndex)
-        bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment))
+        bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment), false)
         UrlMgr.saveEntries(bot, false)
     }
 
     private fun showComment(bot: Mobibot, entry: EntryLink, index: Int, commentIndex: Int) {
-        bot.send(bot.channel, EntriesUtils.buildComment(index, commentIndex, entry.getComment(commentIndex)))
+        bot.send(EntriesUtils.buildComment(index, commentIndex, entry.getComment(commentIndex)))
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 7b9fed5..8a90987 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -42,16 +42,16 @@ import net.thauvin.erik.mobibot.entries.EntryLink
 class Posting : AbstractCommand() {
     override val command = "posting"
     override val help = listOf(
-        Utils.bold("Post a URL, by saying it on a line on its own:"),
+        "Post a URL, by saying it on a line on its own:",
         Utils.helpIndent("<url> [<title>] ${Tags.COMMAND}}: <+tag> [...]]"),
-        "I will reply with a label, for example:" + Utils.bold("${Constants.LINK_CMD}1"),
-        Utils.bold("To add a title, use its label and a pipe:"),
+        "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1",
+        "To add a title, use its label and a pipe:",
         Utils.helpIndent("${Constants.LINK_CMD}1:|This is the title"),
-        Utils.bold("To add a comment:"),
+        "To add a comment:",
         Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
         "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
-        Utils.bold("To edit a comment, see: "),
-        Utils.helpIndent("/msg %s ${Constants.HELP_CMD} ${Comment.COMMAND}")
+        "To edit a comment, see: ",
+        Utils.helpIndent("%s ${Constants.HELP_CMD} ${Comment.COMMAND}")
     )
     override val isOp = false
     override val isPublic = true
@@ -77,7 +77,7 @@ class Posting : AbstractCommand() {
                         '|' -> changeTitle(bot, cmd, index) // L1:|<title>
                         '=' -> changeUrl(bot, cmd, login, isOp, index) // L1:=<url>
                         '?' -> changeAuthor(bot, cmd, sender, isOp, index) // L1:?<author>
-                        else -> addComment(bot, cmd, sender, index)
+                        else -> addComment(bot, cmd, sender, index) // L1:<comment>
                     }
                 }
             }
@@ -92,7 +92,7 @@ class Posting : AbstractCommand() {
         val entry: EntryLink = UrlMgr.getEntry(index)
         val commentIndex = entry.addComment(cmd, sender)
         val comment = entry.getComment(commentIndex)
-        bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment))
+        bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment), false)
         UrlMgr.saveEntries(bot, false)
     }
 
@@ -101,7 +101,7 @@ class Posting : AbstractCommand() {
             val entry: EntryLink = UrlMgr.getEntry(index)
             entry.title = cmd.substring(1).trim()
             bot.updatePin(entry.link, entry)
-            bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+            bot.send(EntriesUtils.buildLink(index, entry))
             UrlMgr.saveEntries(bot, false)
         }
     }
@@ -114,7 +114,7 @@ class Posting : AbstractCommand() {
                 val oldLink = entry.link
                 entry.link = link
                 bot.updatePin(oldLink, entry)
-                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                bot.send(EntriesUtils.buildLink(index, entry))
                 UrlMgr.saveEntries(bot, false)
             }
         }
@@ -125,11 +125,11 @@ class Posting : AbstractCommand() {
             if (cmd.length > 1) {
                 val entry: EntryLink = UrlMgr.getEntry(index)
                 entry.nick = cmd.substring(1)
-                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                bot.send(EntriesUtils.buildLink(index, entry))
                 UrlMgr.saveEntries(bot, false)
             }
         } else {
-            bot.send(sender, "Please ask a channel op to change the author of this link for you.")
+            bot.send(sender, "Please ask a channel op to change the author of this link for you.", false)
         }
     }
 
@@ -141,23 +141,23 @@ class Posting : AbstractCommand() {
                 bot.twitterRemoveEntry(index)
             }
             UrlMgr.removeEntry(index)
-            bot.send(bot.channel, "Entry ${Constants.LINK_CMD}${index + 1} removed.")
+            bot.send("Entry ${Constants.LINK_CMD}${index + 1} removed.")
             UrlMgr.saveEntries(bot, false)
         } else {
-            bot.send(sender, "Please ask a channel op to remove this entry for you.")
+            bot.send(sender, "Please ask a channel op to remove this entry for you.", false)
         }
     }
 
     private fun showEntry(bot: Mobibot, index: Int) {
         val entry: EntryLink = UrlMgr.getEntry(index)
-        bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+        bot.send(EntriesUtils.buildLink(index, entry))
         if (entry.hasTags()) {
-            bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+            bot.send(EntriesUtils.buildTags(index, entry))
         }
         if (entry.hasComments()) {
             val comments = entry.comments
             for (i in comments.indices) {
-                bot.send(bot.channel, EntriesUtils.buildComment(index, i, comments[i]))
+                bot.send(EntriesUtils.buildComment(index, i, comments[i]))
             }
         }
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
index 204f41f..6978794 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -42,7 +42,7 @@ import net.thauvin.erik.mobibot.entries.EntryLink
 class Tags : AbstractCommand() {
     override val command = COMMAND
     override val help = listOf(
-        Utils.bold("To categorize or tag a URL, use its label and a T:"),
+        "To categorize or tag a URL, use its label and a T:",
         Utils.helpIndent("${Constants.LINK_CMD}1T:<+tag|-tag> [...]")
     )
     override val isOp = false
@@ -71,16 +71,16 @@ class Tags : AbstractCommand() {
                 if (entry.login == login || isOp) {
                     entry.setTags(cmd)
                     bot.updatePin(entry.link, entry)
-                    bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+                    bot.send(EntriesUtils.buildTags(index, entry))
                     UrlMgr.saveEntries(bot, false)
                 } else {
-                    bot.send(sender, "Please ask a channel op to change the tags for you.")
+                    bot.send(sender, "Please ask a channel op to change the tags for you.",isPrivate)
                 }
             } else {
                 if (entry.hasTags()) {
-                    bot.send(bot.channel, EntriesUtils.buildTags(index, entry))
+                    bot.send(EntriesUtils.buildTags(index, entry))
                 } else {
-                    bot.send(sender, "The entry has no tags. Why don't add some?")
+                    bot.send(sender, "The entry has no tags. Why don't add some?", isPrivate)
                 }
             }
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
index 89519ef..1daf17e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -128,7 +128,7 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
 
         if (Ignore.isNotIgnored(sender) && (cmds.size == 1 || !cmds[1].contains(bot.nick))) {
             val link = cmds[0].trim()
-            if (!isDupEntry(bot, sender, link)) {
+            if (!isDupEntry(bot, sender, link, isPrivate)) {
                 val isBackup = saveDayBackup(bot)
                 val tags: StringBuilder = StringBuilder(defaultTags)
                 var title = Constants.NO_TITLE
@@ -145,7 +145,7 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
                 entries.add(EntryLink(link, title, sender, login, bot.channel, tags.toString()))
                 val index: Int = entries.size - 1
                 val entry: EntryLink = entries[index]
-                bot.send(bot.channel, EntriesUtils.buildLink(index, entry))
+                bot.send(EntriesUtils.buildLink(index, entry))
 
                 // Add Entry to pinboard.
                 bot.addPin(entry)
@@ -156,10 +156,11 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
                 saveEntries(bot, isBackup)
 
                 if (Constants.NO_TITLE == entry.title) {
-                    bot.send(sender, Utils.bold("Please specify a title, by typing:"))
+                    bot.send(sender, "Please specify a title, by typing:", isPrivate)
                     bot.send(
                         sender,
-                        Utils.helpIndent(Constants.LINK_CMD + (index + 1) + ":|This is the title")
+                        Utils.helpIndent(Constants.LINK_CMD + (index + 1) + ":|This is the title"),
+                        isPrivate
                     )
                 }
             }
@@ -196,12 +197,12 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
         return title
     }
 
-    private fun isDupEntry(bot: Mobibot, sender: String, link: String): Boolean {
+    private fun isDupEntry(bot: Mobibot, sender: String, link: String, isPrivate: Boolean): Boolean {
         synchronized(entries) {
             for (i in entries.indices) {
                 if (link == entries[i].link) {
                     val entry: EntryLink = entries[i]
-                    bot.send(sender, Utils.bold("Duplicate") + " >> " + EntriesUtils.buildLink(i, entry))
+                    bot.send(sender, Utils.bold("Duplicate") + " >> " + EntriesUtils.buildLink(i, entry), isPrivate)
                     return true
                 }
             }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index 1bf601a..94ef295 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -45,8 +45,8 @@ class View : AbstractCommand() {
     private val maxEntries = 8
     override val command = VIEW_CMD
     override val help = listOf(
-        Utils.bold("To list or search the current URL posts:"),
-        Utils.helpIndent("%s: $command [<start>] [<query>]")
+        "To list or search the current URL posts:",
+        Utils.helpIndent("%s $command [<start>] [<query>]")
     )
     override val isOp = false
     override val isPublic = true
@@ -67,7 +67,7 @@ class View : AbstractCommand() {
         if (entriesCount != 0) {
             showPosts(bot, args, sender)
         } else {
-            bot.send(sender, "There is currently nothing to view. Why don't you post something?")
+            bot.send(sender, "There is currently nothing to view. Why don't you post something?", isPrivate)
         }
     }
 
@@ -101,17 +101,17 @@ class View : AbstractCommand() {
             entry = getEntry(i)
             if (lcArgs.isNotBlank()) {
                 if (entry.matches(lcArgs)) {
-                    bot.send(sender, EntriesUtils.buildLink(i, entry, true))
+                    bot.send(sender, EntriesUtils.buildLink(i, entry, true), false)
                     sent++
                 }
             } else {
-                bot.send(sender, EntriesUtils.buildLink(i, entry, true))
+                bot.send(sender, EntriesUtils.buildLink(i, entry, true), false)
                 sent++
             }
             i++
             if (sent == maxEntries && i < max) {
                 bot.send(
-                    sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs")
+                    sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs"), false
                 )
             }
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index e8cee58..44938bf 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -114,16 +114,19 @@ public class Tell {
     /**
      * Responds with Constants.
      *
-     * @param sender The sender.
+     * @param sender    The sender.
+     * @param isPrivate The private flag.
      */
-    public void helpResponse(final String sender) {
-        bot.send(sender, "To send a message to someone when they join the channel:");
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + " <nick> <message>"));
+    public void helpResponse(final String sender, final boolean isPrivate) {
+        bot.send(sender, "To send a message to someone when they join the channel:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + " <nick> <message>"), isPrivate);
 
-        bot.send(sender, "To view queued and sent messages:");
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + View.VIEW_CMD));
+        bot.send(sender, "To view queued and sent messages:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + View.VIEW_CMD), isPrivate);
 
-        bot.send(sender, "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."));
+        bot.send(sender,
+                 "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
+                 isPrivate);
     }
 
     /**
@@ -138,15 +141,16 @@ public class Tell {
     /**
      * Processes the commands.
      *
-     * @param sender The sender's nick.
-     * @param cmds   The commands string.
+     * @param sender    The sender's nick.
+     * @param cmds      The commands string.
+     * @param isPrivate The private flag.
      */
     @SuppressFBWarnings(value = "CC_CYCLOMATIC_COMPLEXITY",
                         justification = "Working on it.")
-    public void response(final String sender, final String cmds) {
+    public void response(final String sender, final String cmds, final boolean isPrivate) {
         final String arrow = " --> ";
         if (StringUtils.isBlank(cmds)) {
-            helpResponse(sender);
+            helpResponse(sender, isPrivate);
         } else if (cmds.startsWith(View.VIEW_CMD)) {
             if (bot.isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(cmds)) {
                 if (!messages.isEmpty()) {
@@ -154,10 +158,10 @@ public class Tell {
                         bot.send(sender, Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
                                          + " [ID: " + message.getId() + ", "
                                          + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
-                                 true);
+                                 isPrivate);
                     }
                 } else {
-                    bot.send(sender, "There are no messages in the queue.", true);
+                    bot.send(sender, "There are no messages in the queue.", isPrivate);
                 }
             } else {
                 boolean hasMessage = false;
@@ -166,7 +170,7 @@ public class Tell {
                     if (message.isMatch(sender)) {
                         if (!hasMessage) {
                             hasMessage = true;
-                            bot.send(sender, "Here are your messages: ", true);
+                            bot.send(sender, "Here are your messages: ", isPrivate);
                         }
 
                         if (message.isReceived()) {
@@ -174,29 +178,30 @@ public class Tell {
                                      Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
                                      + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
                                      + message.getId() + ", DELIVERED]",
-                                     true);
+                                     isPrivate);
 
                         } else {
                             bot.send(sender,
                                      Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
                                      + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
                                      + message.getId() + ", QUEUED]",
-                                     true);
+                                     isPrivate);
                         }
 
-                        bot.send(sender, Utils.helpIndent(message.getMessage()), true);
+                        bot.send(sender, Utils.helpIndent(message.getMessage()), isPrivate);
                     }
                 }
 
                 if (!hasMessage) {
-                    bot.send(sender, "You have no messages in the queue.", true);
+                    bot.send(sender, "You have no messages in the queue.", isPrivate);
                 } else {
-                    bot.send(sender, "To delete one or all delivered messages:");
+                    bot.send(sender, "To delete one or all delivered messages:", isPrivate);
                     bot.send(sender,
                              Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
-                                              + TELL_ALL_KEYWORD + '>'));
-                    bot.send(sender, "Messages are kept for " + Utils.bold(maxDays)
-                                     + Utils.plural(maxDays, " day.", " days."));
+                                              + TELL_ALL_KEYWORD + '>'), isPrivate);
+                    bot.send(sender,
+                             "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
+                             isPrivate);
                 }
             }
         } else if (cmds.startsWith(TELL_DEL_KEYWORD + ' ')) {
@@ -216,9 +221,9 @@ public class Tell {
 
                     if (deleted) {
                         save();
-                        bot.send(sender, "Delivered messages have been deleted.", true);
+                        bot.send(sender, "Delivered messages have been deleted.", isPrivate);
                     } else {
-                        bot.send(sender, "No delivered messages were found.", true);
+                        bot.send(sender, "No delivered messages were found.", isPrivate);
                     }
 
                 } else {
@@ -231,7 +236,7 @@ public class Tell {
                             messages.remove(message);
 
                             save();
-                            bot.send(sender, "Your message was deleted from the queue.", true);
+                            bot.send(sender, "Your message was deleted from the queue.", isPrivate);
                             deleted = true;
                             break;
                         }
@@ -239,14 +244,14 @@ public class Tell {
 
                     if (!deleted) {
                         if (found) {
-                            bot.send(sender, "Only messages that you sent can be deleted.", true);
+                            bot.send(sender, "Only messages that you sent can be deleted.", isPrivate);
                         } else {
-                            bot.send(sender, "The specified message [ID " + id + "] could not be found.", true);
+                            bot.send(sender, "The specified message [ID " + id + "] could not be found.", isPrivate);
                         }
                     }
                 }
             } else {
-                helpResponse(sender);
+                helpResponse(sender, isPrivate);
             }
         } else {
             final String[] split = cmds.split(" ", 2);
@@ -265,7 +270,7 @@ public class Tell {
                     bot.send(sender, "Sorry, the messages queue is currently full.", true);
                 }
             } else {
-                helpResponse(sender);
+                helpResponse(sender, isPrivate);
             }
         }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
index 671db96..12bee34 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
@@ -96,16 +96,13 @@ public abstract class AbstractModule {
 
     /**
      * Responds with the module's Constants.
-     *
-     * @param bot       The bot's instance.
+     *  @param bot       The bot's instance.
      * @param sender    The sender.
-     * @param args      The help arguments.
      * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
      */
     public abstract void helpResponse(final Mobibot bot,
                                       final String sender,
-                                      final String args,
-                                      @SuppressWarnings("unused") final boolean isPrivate);
+                                      final boolean isPrivate);
 
     /**
      * Returns <code>true</code> if the module is enabled.
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
index 8201c8b..f9e1e2f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
@@ -40,8 +40,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import java.text.DecimalFormat;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
-
 /**
  * The Calc module.
  *
@@ -74,7 +72,7 @@ public class Calc extends AbstractModule {
 
         try {
             final Expression calc = new ExpressionBuilder(query).build();
-            return query.replace(" ", "") + " = " + decimalFormat.format(calc.evaluate());
+            return query.replace(" ", "") + " = " + Utils.bold(decimalFormat.format(calc.evaluate()));
         } catch (Exception e) {
             return "No idea. This is the kind of math I don't get.";
         }
@@ -92,7 +90,7 @@ public class Calc extends AbstractModule {
         if (StringUtils.isNotBlank(args)) {
             bot.send(calc(args));
         } else {
-            helpResponse(bot, sender, args, isPrivate);
+            helpResponse(bot, sender, isPrivate);
         }
     }
 
@@ -100,8 +98,8 @@ public class Calc extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To solve a mathematical calculation:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CALC_CMD + " <calculation>"));
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        bot.send(sender, "To solve a mathematical calculation:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CALC_CMD + " <calculation>"), isPrivate);
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
index 4388724..ec1d57c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
@@ -75,7 +75,7 @@ public final class Dice extends AbstractModule {
 
         bot.send(bot.getChannel(),
                  sender + " rolled two dice: " + bold(i) + " and " + bold(y) + " for a total of "
-                 + bold(playerTotal));
+                 + bold(playerTotal), isPrivate);
 
         i = r.nextInt(6) + 1;
         y = r.nextInt(6) + 1;
@@ -97,8 +97,8 @@ public final class Dice extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To roll the dice:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + DICE_CMD));
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        bot.send(sender, "To roll the dice:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + DICE_CMD), isPrivate);
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
index f40b5af..9e92783 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
@@ -52,8 +52,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
-
 /**
  * The GoogleSearch module.
  *
@@ -145,12 +143,12 @@ public final class GoogleSearch extends ThreadedModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
         if (isEnabled()) {
-            bot.send(sender, bold("To search Google:"));
-            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + GOOGLE_CMD + " <query>"));
+            bot.send(sender, "To search Google:", isPrivate);
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + GOOGLE_CMD + " <query>"), isPrivate);
         } else {
-            bot.send(sender, "The Google search module is disabled.");
+            bot.send(sender, "The Google search module is disabled.", isPrivate);
         }
     }
 
@@ -158,7 +156,7 @@ public final class GoogleSearch extends ThreadedModule {
      * Searches Google.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String query) {
+    void run(final Mobibot bot, final String sender, final String cmd, final String query, final boolean isPrivate) {
         if (StringUtils.isNotBlank(query)) {
             try {
                 final List<Message> results = searchGoogle(query, properties.get(GOOGLE_API_KEY_PROP),
@@ -168,10 +166,10 @@ public final class GoogleSearch extends ThreadedModule {
                 }
             } catch (ModuleException e) {
                 bot.getLogger().warn(e.getDebugMessage(), e);
-                bot.send(sender, e.getMessage());
+                bot.send(sender, e.getMessage(), isPrivate);
             }
         } else {
-            helpResponse(bot, sender, query, true);
+            helpResponse(bot, sender, isPrivate);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
index 199e4e7..5f30ccd 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
@@ -44,8 +44,6 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
-
 /**
  * The Joke module.
  *
@@ -107,19 +105,19 @@ public final class Joke extends ThreadedModule {
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
-        new Thread(() -> run(bot, sender, cmd, args)).start();
+        new Thread(() -> run(bot, sender, cmd, args, isPrivate)).start();
     }
 
     /**
      * Returns a random joke from <a href="http://www.icndb.com/">The Internet Chuck Norris Database</a>.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String arg) {
+    void run(final Mobibot bot, final String sender, final String cmd, final String arg, final boolean isPrivate) {
         try {
             bot.send(Utils.cyan(randomJoke().getMessage()));
         } catch (ModuleException e) {
             bot.getLogger().warn(e.getDebugMessage(), e);
-            bot.send(sender, e.getMessage());
+            bot.send(sender, e.getMessage(), isPrivate);
         }
     }
 
@@ -127,8 +125,8 @@ public final class Joke extends ThreadedModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To retrieve a random joke:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + JOKE_CMD));
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        bot.send(sender, "To retrieve a random joke:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + JOKE_CMD), isPrivate);
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
index 676ebbe..c1292f6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
@@ -41,8 +41,6 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
-
 /**
  * The Lookup module.
  *
@@ -189,7 +187,7 @@ public final class Lookup extends AbstractModule {
                 }
             }
         } else {
-            helpResponse(bot, sender, args, true);
+            helpResponse(bot, sender, true);
         }
     }
 
@@ -197,8 +195,8 @@ public final class Lookup extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To perform a DNS lookup query:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + LOOKUP_CMD + " <ip address or hostname>"));
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        bot.send(sender, "To perform a DNS lookup query:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + LOOKUP_CMD + " <ip address or hostname>"), isPrivate);
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
index 4e689a8..6123898 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
@@ -39,8 +39,6 @@ import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.List;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
-
 /**
  * The Ping module.
  *
@@ -96,8 +94,8 @@ public class Ping extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To ping the bot:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + PING_CMD));
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        bot.send(sender, "To ping the bot:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + PING_CMD), isPrivate);
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java
index 7119950..6bdc29f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java
@@ -52,14 +52,18 @@ public abstract class ThreadedModule extends AbstractModule {
                                 final String args,
                                 final boolean isPrivate) {
         if (isEnabled() && args.length() > 0) {
-            new Thread(() -> run(bot, sender, cmd, args)).start();
+            new Thread(() -> run(bot, sender, cmd, args, isPrivate)).start();
         } else {
-            helpResponse(bot, sender, args, isPrivate);
+            helpResponse(bot, sender, isPrivate);
         }
     }
 
     /**
      * Runs the thread.
      */
-    abstract void run(Mobibot bot, String sender, @SuppressWarnings("unused") String cmd, String args);
+    abstract void run(Mobibot bot,
+                      String sender,
+                      @SuppressWarnings("unused") String cmd,
+                      String args,
+                      boolean isPrivate);
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index f3ed606..2d0c997 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -41,8 +41,6 @@ import twitter4j.Status;
 import twitter4j.TwitterFactory;
 import twitter4j.conf.ConfigurationBuilder;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
-
 /**
  * The Twitter module.
  *
@@ -116,12 +114,12 @@ public final class Twitter extends ThreadedModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
         if (isEnabled()) {
-            bot.send(sender, bold("To post to Twitter:"));
-            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TWITTER_CMD + " <message>"));
+            bot.send(sender, "To post to Twitter:", isPrivate);
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TWITTER_CMD + " <message>"), isPrivate);
         } else {
-            bot.send(sender, "The Twitter posting facility is disabled.");
+            bot.send(sender, "The Twitter posting facility is " + Utils.bold("disabled") + '.', isPrivate);
         }
     }
 
@@ -149,13 +147,14 @@ public final class Twitter extends ThreadedModule {
      * Posts to twitter.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String message) {
+    void run(final Mobibot bot, final String sender, final String cmd, final String message, final boolean isPrivate) {
         try {
             bot.send(sender,
-                     post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getMessage());
+                     post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getMessage(),
+                     isPrivate);
         } catch (ModuleException e) {
             bot.getLogger().warn(e.getDebugMessage(), e);
-            bot.send(sender, e.getMessage());
+            bot.send(sender, e.getMessage(), isPrivate);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 9d6087e..a7b294b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -81,9 +81,8 @@ public final class War extends AbstractModule {
             i = r.nextInt(WAR_DECK.length);
             y = r.nextInt(WAR_DECK.length);
 
-            bot.send(bot.getChannel(),
-                     sender + " drew the " + bold(WAR_DECK[i]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
-            bot.action("drew the " + bold(WAR_DECK[y]) + " of " + WAR_SUITS[r.nextInt(WAR_SUITS.length)]);
+            bot.send(sender + " drew the " + bold(WAR_DECK[i]) + " of " + bold(WAR_SUITS[r.nextInt(WAR_SUITS.length)]));
+            bot.action("drew the " + bold(WAR_DECK[y]) + " of " + bold(WAR_SUITS[r.nextInt(WAR_SUITS.length)]));
 
             if (i != y) {
                 break;
@@ -103,8 +102,8 @@ public final class War extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To play war:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WAR_CMD));
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        bot.send(sender, "To play war:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WAR_CMD), isPrivate);
     }
 }

From 0fda50b4e175cad0a1bced8fd0d20f9d69c3d0b4 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 15:39:55 -0700
Subject: [PATCH 015/262] Reworked.

---
 .../mobibot/modules/CurrencyConverter.java    | 188 +++++++++---------
 1 file changed, 97 insertions(+), 91 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
index c66f968..c9cfba1 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
@@ -38,7 +38,6 @@ import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
 import net.thauvin.erik.mobibot.msg.ErrorMessage;
 import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.msg.NoticeMessage;
 import net.thauvin.erik.mobibot.msg.PublicMessage;
 import org.apache.commons.lang3.StringUtils;
 import org.jdom2.Document;
@@ -51,13 +50,11 @@ import javax.xml.XMLConstants;
 import java.io.IOException;
 import java.net.URL;
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
-
 /**
  * The CurrentConverter module.
  *
@@ -67,13 +64,12 @@ import static net.thauvin.erik.mobibot.Utils.bold;
  */
 @SuppressWarnings("PMD.UseConcurrentHashMap")
 public final class CurrencyConverter extends ThreadedModule {
-    /**
-     * The rates keyword.
-     */
-    static final String CURRENCY_RATES_KEYWORD = "rates";
-
     // Currency command
     private static final String CURRENCY_CMD = "currency";
+    // Rates keyword
+    private static final String CURRENCY_RATES_KEYWORD = "rates";
+    // Empty rate table.
+    private static final String EMPTY_RATE_TABLE = "Sorry, but the exchange rate table is empty.";
     // Exchange rates
     private static final Map<String, String> EXCHANGE_RATES = new TreeMap<>();
     // Exchange rates table URL
@@ -96,9 +92,54 @@ public final class CurrencyConverter extends ThreadedModule {
      *
      * @param query The query.
      * @return The {@link Message} contained the converted currency.
-     * @throws ModuleException If an error occurs while converting.
      */
-    static Message convertCurrency(final String query) throws ModuleException {
+    static Message convertCurrency(final String query) {
+        final String[] cmds = query.split(" ");
+
+        if (cmds.length == 4) {
+            if (cmds[3].equals(cmds[1]) || "0".equals(cmds[0])) {
+                return new PublicMessage("You're kidding, right?");
+            } else {
+                final String to = cmds[1].toUpperCase(Constants.LOCALE);
+                final String from = cmds[3].toUpperCase(Constants.LOCALE);
+
+                if (EXCHANGE_RATES.containsKey(to) && EXCHANGE_RATES.containsKey(from)) {
+                    try {
+                        final double amt = Double.parseDouble(cmds[0].replace(",", ""));
+                        final double doubleFrom = Double.parseDouble(EXCHANGE_RATES.get(to));
+                        final double doubleTo = Double.parseDouble(EXCHANGE_RATES.get(from));
+
+                        return new PublicMessage(
+                                NumberFormat.getCurrencyInstance(Constants.LOCALE).format(amt).substring(1)
+                                + ' '
+                                + cmds[1].toUpperCase(Constants.LOCALE)
+                                + " = "
+                                + NumberFormat.getCurrencyInstance(Constants.LOCALE)
+                                              .format((amt * doubleTo) / doubleFrom)
+                                              .substring(1)
+                                + ' '
+                                + cmds[3].toUpperCase(Constants.LOCALE));
+                    } catch (NumberFormatException e) {
+                        return new ErrorMessage("Let's try with some real numbers next time, okay?");
+                    }
+                } else {
+                    return new ErrorMessage("Sounds like monopoly money to me!");
+                }
+            }
+        }
+        return new ErrorMessage("Invalid query. Let's try again.");
+    }
+
+    static List<String> currencyRates() {
+        final List<String> rates = new ArrayList<>(33);
+        for (final Map.Entry<String, String> rate : EXCHANGE_RATES.entrySet()) {
+            rates.add("  " + rate.getKey() + ": " + StringUtils.leftPad(rate.getValue(), 8));
+        }
+
+        return rates;
+    }
+
+    static void loadRates() throws ModuleException {
         if (EXCHANGE_RATES.isEmpty()) {
             try {
                 final SAXBuilder builder = new SAXBuilder();
@@ -116,71 +157,20 @@ public final class CurrencyConverter extends ThreadedModule {
                 pubDate = cubeTime.getAttribute("time").getValue();
 
                 final List<Element> cubes = cubeTime.getChildren();
-                Element cube;
 
-                for (final Element rawCube : cubes) {
-                    cube = rawCube;
+                for (final Element cube : cubes) {
                     EXCHANGE_RATES.put(
                             cube.getAttribute("currency").getValue(),
                             cube.getAttribute("rate").getValue());
                 }
 
                 EXCHANGE_RATES.put("EUR", "1");
-            } catch (JDOMException e) {
-                throw new ModuleException(query, "An error has occurred while parsing the exchange rates table.", e);
-            } catch (IOException e) {
-                throw new ModuleException(
-                        query, "An error has occurred while fetching the exchange rates table.", e);
+            } catch (JDOMException | IOException e) {
+                throw new ModuleException(e.getMessage(),
+                                          "An error has occurred while parsing the exchange rates table.",
+                                          e);
             }
         }
-
-        if (EXCHANGE_RATES.isEmpty()) {
-            return new ErrorMessage("Sorry, but the exchange rate table is empty.");
-        } else {
-            final String[] cmds = query.split(" ");
-
-            if (cmds.length == 4) {
-                if (cmds[3].equals(cmds[1]) || "0".equals(cmds[0])) {
-                    return new ErrorMessage("You're kidding, right?");
-                } else {
-                    try {
-                        final double amt = Double.parseDouble(cmds[0].replace(",", ""));
-                        final double from =
-                                Double.parseDouble(EXCHANGE_RATES.get(cmds[1].toUpperCase(Constants.LOCALE)));
-                        final double to = Double.parseDouble(EXCHANGE_RATES.get(cmds[3].toUpperCase(Constants.LOCALE)));
-
-                        return new PublicMessage(
-                                NumberFormat.getCurrencyInstance(Locale.US).format(amt).substring(1)
-                                + ' '
-                                + cmds[1].toUpperCase(Constants.LOCALE)
-                                + " = "
-                                + NumberFormat.getCurrencyInstance(Locale.US)
-                                              .format((amt * to) / from)
-                                              .substring(1)
-                                + ' '
-                                + cmds[3].toUpperCase(Constants.LOCALE));
-                    } catch (Exception e) {
-                        throw new ModuleException("convertCurrency(" + query + ')',
-                                                  "The supported currencies are: " + EXCHANGE_RATES.keySet(), e);
-                    }
-                }
-            } else if (CURRENCY_RATES_KEYWORD.equals(query)) {
-
-                final StringBuilder buff = new StringBuilder().append('[').append(pubDate).append("]: ");
-
-                int i = 0;
-                for (final Map.Entry<String, String> rate : EXCHANGE_RATES.entrySet()) {
-                    if (i > 0) {
-                        buff.append(", ");
-                    }
-                    buff.append(rate.getKey()).append(": ").append(rate.getValue());
-                    i++;
-                }
-
-                return new NoticeMessage(buff.toString());
-            }
-        }
-        return new ErrorMessage("The supported currencies are: " + EXCHANGE_RATES.keySet());
     }
 
     /**
@@ -206,38 +196,54 @@ public final class CurrencyConverter extends ThreadedModule {
      */
     @SuppressFBWarnings("REDOS")
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String query) {
-        if (StringUtils.isNotBlank(sender) && StringUtils.isNotBlank(query)) {
-            if (query.matches("\\d+([,\\d]+)?(\\.\\d+)? [a-zA-Z]{3}+ to [a-zA-Z]{3}+")) {
-                try {
-                    final Message msg = convertCurrency(query);
-                    if (msg.isError()) {
-                        helpResponse(bot, sender, CURRENCY_CMD + ' ' + query, false);
-                    }
-                    bot.send(sender, msg);
-                } catch (ModuleException e) {
-                    bot.getLogger().warn(e.getDebugMessage(), e);
-                    bot.send(sender, e.getMessage());
-                }
-            } else {
-                helpResponse(bot, sender, CURRENCY_CMD + ' ' + query, true);
+    void run(final Mobibot bot, final String sender, final String cmd, final String query, final boolean isPrivate) {
+        if (EXCHANGE_RATES.isEmpty()) {
+            try {
+                loadRates();
+            } catch (ModuleException e) {
+                bot.getLogger().warn(e.getDebugMessage(), e);
             }
         }
+
+        if (EXCHANGE_RATES.isEmpty()) {
+            bot.send(sender, EMPTY_RATE_TABLE, true);
+        } else if (query.matches("\\d+([,\\d]+)?(\\.\\d+)? [a-zA-Z]{3}+ to [a-zA-Z]{3}+")) {
+            final Message msg = convertCurrency(query);
+            bot.send(sender, msg);
+            if (msg.isError()) {
+                helpResponse(bot, sender, isPrivate);
+            }
+        } else if (query.contains(CURRENCY_RATES_KEYWORD)) {
+            bot.send(sender, "The currency rates for " + Utils.bold(pubDate) + " are:", isPrivate);
+            bot.sendCommandsList(sender, currencyRates(), 3, isPrivate, false);
+        } else {
+            helpResponse(bot, sender, isPrivate);
+        }
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To convert from one currency to another:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD + " [100 USD to EUR]"));
-
-        if (args.endsWith(CURRENCY_CMD)) {
-            bot.send(sender, bold("For a listing of currency rates:"));
-            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD) + ' ' + CURRENCY_RATES_KEYWORD);
-            bot.send(sender, bold("For a listing of supported currencies:"));
-            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD));
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        if (EXCHANGE_RATES.isEmpty()) {
+            try {
+                loadRates();
+            } catch (ModuleException e) {
+                bot.getLogger().debug(e.getDebugMessage(), e);
+            }
+        }
+        if (EXCHANGE_RATES.isEmpty()) {
+            bot.send(sender, EMPTY_RATE_TABLE, isPrivate);
+        } else {
+            bot.send(sender, "To convert from one currency to another:", isPrivate);
+            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD + " 100 USD to EUR"), isPrivate);
+            bot.send(sender, "For a listing of current rates:", isPrivate);
+            bot.send(sender,
+                     Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD) + ' ' + CURRENCY_RATES_KEYWORD,
+                     isPrivate);
+            bot.send(sender, "The supported currencies are: ", isPrivate);
+            bot.sendCommandsList(sender, new ArrayList<>(EXCHANGE_RATES.keySet()), 11, isPrivate, false);
         }
     }
 }

From 07ab869388023c2544008379bec5742ca4a2f145 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 15:40:07 -0700
Subject: [PATCH 016/262] Reworked.

---
 .../erik/mobibot/modules/RockPaperScissors.kt       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index a3de8e5..061f08e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -100,20 +100,21 @@ class RockPaperScissors : AbstractModule() {
             }
             else -> {
                 bot.action(
-                    "${green(botHand.name)} ${bold(botHand.action)} ${red(botHand.name)} ~ You lose ~"
+                    "${green(botHand.name)} ${bold(botHand.action)} ${red(hand.name)} ~ You lose ~"
                 )
             }
         }
     }
 
-    override fun helpResponse(bot: Mobibot, sender: String, args: String?, isPrivate: Boolean) {
-        bot.send(sender, bold("To play Rock Paper Scissors:"))
+    override fun helpResponse(bot: Mobibot, sender: String, isPrivate: Boolean) {
+        bot.send(sender, "To play Rock Paper Scissors:", isPrivate)
         bot.send(
             sender,
             helpIndent(
-                "${bot.nick}: ${Hands.ROCK.name.toLowerCase()} or ${Hands.PAPER.name.toLowerCase()}"
-                    + " or ${Hands.SCISSORS.name.toLowerCase()}"
-            )
+                "${bot.nick}: ${Hands.ROCK.name.toLowerCase()} | ${Hands.PAPER.name.toLowerCase()}"
+                    + " | ${Hands.SCISSORS.name.toLowerCase()}"
+            ),
+            isPrivate
         )
     }
 }

From ced0aa97f88925c2063ab4e74d4a92d301579194 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 15:40:50 -0700
Subject: [PATCH 017/262] Fixed isPrivate() usage.

---
 .../thauvin/erik/mobibot/modules/StockQuote.java   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
index 72e1517..925c719 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
@@ -52,8 +52,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
-
 /**
  * The StockQuote module.
  *
@@ -206,16 +204,16 @@ public final class StockQuote extends ThreadedModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To retrieve a stock quote:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + STOCK_CMD + " <symbol|keywords>"));
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        bot.send(sender, "To retrieve a stock quote:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + STOCK_CMD + " <symbol|keywords>"), isPrivate);
     }
 
     /**
-     * Returns the specified stock quote from Alpha Advantage.
+     * Returns the specified stock quote from Alpha Avantage.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String symbol) {
+    void run(final Mobibot bot, final String sender, final String cmd, final String symbol, final boolean isPrivate) {
         if (StringUtils.isNotBlank(symbol)) {
             try {
                 final List<Message> messages = getQuote(symbol, properties.get(ALPHAVANTAGE_API_KEY_PROP));
@@ -227,7 +225,7 @@ public final class StockQuote extends ThreadedModule {
                 bot.send(e.getMessage());
             }
         } else {
-            helpResponse(bot, sender, symbol, true);
+            helpResponse(bot, sender, isPrivate);
         }
     }
 }

From 968823828a157cbbe6fa72dc2068ecd81f4e3c90 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 15:41:48 -0700
Subject: [PATCH 018/262] Cleanup.

---
 .../erik/mobibot/modules/Weather2.java        | 38 +++++++++--------
 .../erik/mobibot/modules/WorldTime.java       | 41 +++++++++++--------
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
index 53822e1..1463e36 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
@@ -92,7 +92,7 @@ public class Weather2 extends ThreadedModule {
     @SuppressWarnings("AvoidEscapedUnicodeCharacters")
     private static String getTemps(final Double d) {
         final double c = (d - 32) * 5 / 9;
-        return Math.round(d) + " \u00B0F, " + Math.round(c) + " \u00B0C";
+        return Math.round(d) + " °F, " + Math.round(c) + " °C";
     }
 
     /**
@@ -138,7 +138,8 @@ public class Weather2 extends ThreadedModule {
                         cwd = owm.currentWeatherByCityName(city, getCountry(country));
                     }
                     if (cwd.hasCityName()) {
-                        messages.add(new PublicMessage("City: " + cwd.getCityName() + " [" + country + "]"));
+                        messages.add(new PublicMessage(
+                                "City: " + cwd.getCityName() + " [" + StringUtils.upperCase(country) + "]"));
 
                         final Main main = cwd.getMainData();
                         if (main != null) {
@@ -159,15 +160,13 @@ public class Weather2 extends ThreadedModule {
                         }
 
                         if (cwd.hasWeatherList()) {
-                            final StringBuilder condition = new StringBuilder("Condition: ");
+                            final StringBuilder condition = new StringBuilder("Condition:");
                             final List<Weather> list = cwd.getWeatherList();
                             if (list != null) {
                                 for (final Weather w : list) {
-                                    if (condition.indexOf(",") == -1) {
-                                        condition.append(StringUtils.capitalize(w.getDescription()));
-                                    } else {
-                                        condition.append(", ").append(w.getDescription());
-                                    }
+                                    condition.append(' ')
+                                             .append(StringUtils.capitalize(w.getDescription()))
+                                             .append('.');
                                 }
                                 messages.add(new NoticeMessage(condition.toString()));
                             }
@@ -182,7 +181,8 @@ public class Weather2 extends ThreadedModule {
                                         "https://openweathermap.org/find"))
                                                            .newBuilder()
                                                            .addQueryParameter("q",
-                                                                              city + ',' + country)
+                                                                              city + ','
+                                                                              + StringUtils.upperCase(country))
                                                            .build();
                                 messages.add(new NoticeMessage(url.toString(), Colors.GREEN));
                             }
@@ -210,26 +210,28 @@ public class Weather2 extends ThreadedModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To display weather information:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " <city> [, <country code>]"));
-        bot.send(sender, "For example:");
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " paris, fr"));
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        bot.send(sender, "To display weather information:", isPrivate);
+        bot.send(sender,
+                 Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " <city> [, <country code>]"),
+                 isPrivate);
+        bot.send(sender, "For example:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " paris, fr"), isPrivate);
         bot.send(sender,
                  "The default ISO 3166 country code is " + bold("US")
-                 + ". Zip codes are supported in most countries.");
+                 + ". Zip codes are supported in most countries.", isPrivate);
     }
 
     /**
      * Fetches the weather data from a specific city.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String args) {
+    void run(final Mobibot bot, final String sender, final String cmd, final String args, final boolean isPrivate) {
         if (StringUtils.isNotBlank(args)) {
             try {
                 final List<Message> messages = getWeather(args, properties.get(OWM_API_KEY_PROP));
                 if (messages.get(0).isError()) {
-                    helpResponse(bot, sender, args, true);
+                    helpResponse(bot, sender, isPrivate);
                 } else {
                     for (final Message msg : messages) {
                         bot.send(sender, msg);
@@ -240,7 +242,7 @@ public class Weather2 extends ThreadedModule {
                 bot.send(e.getMessage());
             }
         } else {
-            helpResponse(bot, sender, args, true);
+            helpResponse(bot, sender, isPrivate);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
index a19f33e..bac4eb0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
@@ -44,12 +44,11 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoField;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
-import static net.thauvin.erik.mobibot.Utils.bold;
-
 /**
  * The WorldTime module.
  *
@@ -195,14 +194,16 @@ public final class WorldTime extends AbstractModule {
 
         if (tz != null) {
             if (BEATS_KEYWORD.equals(tz)) {
-                response = ("The current Internet Time is: " + internetTime() + ' ' + BEATS_KEYWORD);
+                response = ("The current Internet Time is: " + Utils.bold(internetTime() + ' ' + BEATS_KEYWORD));
             } else {
                 response = ZonedDateTime.now().withZoneSameInstant(ZoneId.of(tz)).format(
-                        DateTimeFormatter.ofPattern("'The time is 'HH:mm' on 'EEEE, d MMMM yyyy' in '"))
-                           + tz.substring(tz.indexOf('/') + 1).replace('_', ' ');
+                        DateTimeFormatter
+                                .ofPattern("'The time is " + Utils.bold("'HH:mm'") + " on " + Utils.bold(
+                                        "'EEEE, d MMMM yyyy'") + " in '"))
+                           + Utils.bold(tz.substring(tz.indexOf('/') + 1).replace('_', ' '));
             }
         } else {
-            return new ErrorMessage("The supported countries/zones are: " + COUNTRIES_MAP.keySet());
+            return new ErrorMessage("Unsupported country/zone. Please try again.");
         }
 
         return new PublicMessage(response);
@@ -217,15 +218,19 @@ public final class WorldTime extends AbstractModule {
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
-        final Message msg = worldTime(args);
-
-        if (isPrivate) {
-            bot.send(sender, msg.getMessage(), true);
+        if (args.length() == 0) {
+            bot.send(sender, "The supported countries/zones are: ", isPrivate);
+            bot.sendCommandsList(sender, new ArrayList<>(COUNTRIES_MAP.keySet()), 17, false, false);
         } else {
-            if (msg.isError()) {
-                bot.send(sender, msg.getMessage());
+            final Message msg = worldTime(args);
+            if (isPrivate) {
+                bot.send(sender, msg.getMessage(), true);
             } else {
-                bot.send(msg.getMessage());
+                if (msg.isError()) {
+                    bot.send(sender, msg.getMessage(), false);
+                } else {
+                    bot.send(msg.getMessage());
+                }
             }
         }
     }
@@ -234,12 +239,12 @@ public final class WorldTime extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
-        bot.send(sender, bold("To display a country's current date/time:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD) + " [<country code>]");
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        bot.send(sender, "To display a country's current date/time:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD) + " [<country code>]", isPrivate);
 
-        bot.send(sender, bold("For a listing of the supported countries:"));
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD));
+        bot.send(sender, "For a listing of the supported countries:", isPrivate);
+        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD), isPrivate);
     }
 
     /**

From 1035f5ba05a6d2b348d07c7f0e09ea1dda3155b9 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 15:42:07 -0700
Subject: [PATCH 019/262] Updated tests.

---
 detekt-baseline.xml                           |  4 +++
 .../erik/mobibot/modules/CalcTest.java        |  7 ++--
 .../modules/CurrencyConverterTest.java        | 36 ++++++++++---------
 .../erik/mobibot/modules/WordTimeTest.java    |  3 +-
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 4e8f359..8af6eed 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -4,13 +4,17 @@
   <Whitelist>
     <ID>LongParameterList:AbstractCommand.kt$AbstractCommand$( bot: Mobibot, sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
+    <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
     <ID>MagicNumber:Comment.kt$Comment$3</ID>
     <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
+    <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
+    <ID>MagicNumber:Modules.kt$Modules$7</ID>
     <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
     <ID>MagicNumber:UrlMgr.kt$UrlMgr$1000L</ID>
     <ID>MagicNumber:UrlMgr.kt$UrlMgr$60L</ID>
     <ID>MagicNumber:View.kt$View$8</ID>
+    <ID>NestedBlockDepth:Comment.kt$Comment$commandResponse</ID>
     <ID>NestedBlockDepth:UrlMgr.kt$UrlMgr$commandResponse</ID>
   </Whitelist>
 </SmellBaseline>
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
index 0d5de03..c108282 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
@@ -32,6 +32,7 @@
 
 package net.thauvin.erik.mobibot.modules;
 
+import net.thauvin.erik.mobibot.Utils;
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -46,9 +47,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class CalcTest {
     @Test
     public void testCalc() {
-        assertThat(Calc.calc("1 + 1")).as("calc(1+1)").isEqualTo("1+1 = 2");
-        assertThat(Calc.calc("1 -3")).as("calc(1 -3)").isEqualTo("1-3 = -2");
-        assertThat(Calc.calc("pi+π+e+φ")).as("calc(pi+π+e+φ)").isEqualTo("pi+π+e+φ = 10.62");
+        assertThat(Calc.calc("1 + 1")).as("calc(1+1)").isEqualTo("1+1 = %s", Utils.bold(2));
+        assertThat(Calc.calc("1 -3")).as("calc(1 -3)").isEqualTo("1-3 = %s", Utils.bold(-2));
+        assertThat(Calc.calc("pi+π+e+φ")).as("calc(pi+π+e+φ)").isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"));
         assertThat(Calc.calc("one + one")).as("calc(one + one)").startsWith("No idea.");
     }
 
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
index a437408..9291c4f 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
@@ -33,7 +33,7 @@
 package net.thauvin.erik.mobibot.modules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.msg.ErrorMessage;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -46,26 +46,28 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @since 1.0
  */
 public class CurrencyConverterTest {
-    @Test
-    public void testCurrencyConvertererImpl() {
-        AbstractModuleTest.testAbstractModule(new CurrencyConverter());
-    }
-
-    @Test(expectedExceptions = ModuleException.class)
-    public void testException() throws ModuleException {
-        CurrencyConverter.convertCurrency("100 BLA to USD");
+    @BeforeClass
+    public void before() throws ModuleException {
+        CurrencyConverter.loadRates();
     }
 
     @Test
     @SuppressFBWarnings("PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS")
-    public void testConvertCurrency() throws ModuleException {
+    public void testConvertCurrency() {
         assertThat(CurrencyConverter.convertCurrency("100 USD to EUR").getMessage())
-            .as("100 USD to EUR").startsWith("100.00 USD = ");
-        assertThat(CurrencyConverter.convertCurrency("100 USD to USD"))
-            .as("100 USD to USD").isInstanceOf(ErrorMessage.class);
-        assertThat(CurrencyConverter.convertCurrency(CurrencyConverter.CURRENCY_RATES_KEYWORD).isNotice())
-            .as(CurrencyConverter.CURRENCY_RATES_KEYWORD + " is notice").isTrue();
-        assertThat(CurrencyConverter.convertCurrency(CurrencyConverter.CURRENCY_RATES_KEYWORD).getMessage())
-            .as(CurrencyConverter.CURRENCY_RATES_KEYWORD).contains("USD: ");
+                .as("100 USD to EUR").matches("100\\.00 USD = \\d{2,3}\\.\\d{2} EUR");
+        assertThat(CurrencyConverter.convertCurrency("100 USD to USD").getMessage())
+                .as("100 USD to USD").contains("You're kidding, right?");
+        assertThat(CurrencyConverter.convertCurrency("100 USD").getMessage())
+                .as("100 USD").contains("Invalid query.");
+        assertThat(CurrencyConverter.currencyRates().size())
+                .as("currencyRates().size() == 33").isEqualTo(33);
+        assertThat(CurrencyConverter.currencyRates())
+                .as("currencyRates().get(EUR)").contains("  EUR:        1");
+    }
+
+    @Test
+    public void testCurrencyConvertererImpl() {
+        AbstractModuleTest.testAbstractModule(new CurrencyConverter());
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
index b7cfc43..7f623ff 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
@@ -32,6 +32,7 @@
 
 package net.thauvin.erik.mobibot.modules;
 
+import net.thauvin.erik.mobibot.Utils;
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -46,7 +47,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class WordTimeTest {
     @Test
     public void testWorldTime() {
-        assertThat(WorldTime.worldTime("PST").getMessage()).as("PST").endsWith("Los Angeles");
+        assertThat(WorldTime.worldTime("PST").getMessage()).as("PST").endsWith(Utils.bold("Los Angeles"));
         assertThat(WorldTime.worldTime("BLAH").isError()).as("BLAH").isTrue();
         assertThat(WorldTime.worldTime("BEATS").getMessage()).as("BEATS").contains("@");
     }

From 08260a632b4325b425aad2f85f21253541f8174a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 15:42:34 -0700
Subject: [PATCH 020/262] Fixed generic exception catching.

---
 .../thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
index c03af95..fd98c72 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
@@ -100,9 +100,7 @@ final class TellMessagesMgr {
             }
         } catch (FileNotFoundException ignore) {
             // Do nothing
-        } catch (IOException e) {
-            logger.error("An IO error occurred loading the messages queue.", e);
-        } catch (Exception e) {
+        } catch (IOException | ClassNotFoundException e) {
             logger.error("An error occurred loading the messages queue.", e);
         }
 

From b0b881e22bb69615ae6c69ce98a9d7cae14bcbc1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 17:13:49 -0700
Subject: [PATCH 021/262] Added AddLog command.

---
 .../net/thauvin/erik/mobibot/Constants.java   |  4 --
 .../net/thauvin/erik/mobibot/Mobibot.java     | 41 +++++-------
 .../thauvin/erik/mobibot/commands/AddLog.kt   | 67 +++++++++++++++++++
 3 files changed, 83 insertions(+), 29 deletions(-)
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt

diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.java b/src/main/java/net/thauvin/erik/mobibot/Constants.java
index 411c688..9943398 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.java
@@ -42,10 +42,6 @@ import java.util.Locale;
  * @since 1.0
  */
 public final class Constants {
-    /**
-     * The add (back)log command.
-     */
-    public static final String ADDLOG_CMD = "addlog";
     /**
      * The connect/read timeout in ms.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 63a6e4d..cf460ea 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -34,6 +34,7 @@ package net.thauvin.erik.mobibot;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.thauvin.erik.mobibot.commands.AbstractCommand;
+import net.thauvin.erik.mobibot.commands.AddLog;
 import net.thauvin.erik.mobibot.commands.Cycle;
 import net.thauvin.erik.mobibot.commands.Ignore;
 import net.thauvin.erik.mobibot.commands.Info;
@@ -85,7 +86,6 @@ import org.apache.logging.log4j.core.config.Configurator;
 import org.jibble.pircbot.PircBot;
 import org.jibble.pircbot.User;
 
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -240,6 +240,7 @@ public class Mobibot extends PircBot {
         ignoreCommand = new Ignore(p.getProperty("ignore", ""));
 
         // Load the commands
+        commands.add(new AddLog());
         commands.add(new Cycle());
         commands.add(ignoreCommand);
         commands.add(new Info());
@@ -858,38 +859,28 @@ public class Mobibot extends PircBot {
 
         final boolean isOp = isOp(sender);
 
-        if (cmd.startsWith(Constants.HELP_CMD)) {
+        if (cmd.startsWith(Constants.HELP_CMD)) { // help
             helpResponse(sender, args, true);
-        } else if (isOp && "kill".equals(cmd)) {
+        } else if (isOp && "kill".equals(cmd)) { // kill
             sendRawLine("QUIT : Poof!");
             System.exit(0);
-        } else if (isOp && Constants.DIE_CMD.equals(cmd)) {
-            send(sender + " has just signed my death sentence.");
-            timer.cancel();
-            twitterShutdown();
-            twitterNotification("killed by  " + sender + " on " + ircChannel);
-
-            sleep(3);
-            quitServer("The Bot Is Out There!");
-            System.exit(0);
-        } else if (isOp && (cmds.length > 1) && Constants.ADDLOG_CMD.equals(cmd)) {
-            // e.g 2014-04-01
-            final File backlog = new File(logsDir + args + EntriesMgr.XML_EXT);
-            if (backlog.exists()) {
-                UrlMgr.addHistory(0, args);
-                send(sender, UrlMgr.getHistory().toString(), true);
-            } else {
-                send(sender, "The specified log could not be found.", true);
-            }
-        } else if (Tell.TELL_CMD.equals(cmd) && tell.isEnabled()) {
-            tell.response(sender, args, true);
-        } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) {
+        } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) { // debug
             if (logger.isDebugEnabled()) {
                 Configurator.setLevel(logger.getName(), loggerLevel);
             } else {
                 Configurator.setLevel(logger.getName(), Level.DEBUG);
             }
             send(sender, "Debug logging is " + (logger.isDebugEnabled() ? "enabled." : "disabled."), true);
+        } else if (isOp && Constants.DIE_CMD.equals(cmd)) { // die
+            send(sender + " has just signed my death sentence.");
+            timer.cancel();
+            twitterShutdown();
+            twitterNotification("killed by  " + sender + " on " + ircChannel);
+            sleep(3);
+            quitServer("The Bot Is Out There!");
+            System.exit(0);
+        } else if (Tell.TELL_CMD.equals(cmd) && tell.isEnabled()) { // tell
+            tell.response(sender, args, true);
         } else {
             for (final AbstractCommand command : commands) {
                 if (command.getCommand().startsWith(cmd)) {
@@ -1054,7 +1045,7 @@ public class Mobibot extends PircBot {
      */
     final void setPinboardAuth(final String apiToken) {
         if (isNotBlank(apiToken)) {
-            pinboard = new Pinboard(this, apiToken, ircServer);
+            pinboard = new Pinboard(this, apiToken);
         }
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
new file mode 100644
index 0000000..0c01306
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
@@ -0,0 +1,67 @@
+/*
+ * AddLog.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.addHistory
+import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.getHistory
+import net.thauvin.erik.mobibot.entries.EntriesMgr
+import java.io.File
+
+class AddLog : AbstractCommand() {
+    override val command = "addlog"
+    override val help = emptyList<String>()
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = false
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp && args.isNotBlank()) {
+            // e.g: 2014-04-01
+            val backlog = File("${bot.logsDir}$args${EntriesMgr.XML_EXT}")
+            if (backlog.exists()) {
+                addHistory(0, args)
+                bot.send(sender, getHistory().toString(), isPrivate)
+            } else {
+                bot.send(sender, "The specified log could not be found.", isPrivate)
+            }
+        }
+    }
+}

From 9da263847547964672e7a108341fb42e35f84bce Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 17:14:06 -0700
Subject: [PATCH 022/262] Cleanup.

---
 src/main/java/net/thauvin/erik/mobibot/Pinboard.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java b/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
index b9f538d..58dac14 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
@@ -60,11 +60,10 @@ class Pinboard {
      *
      * @param bot       The bot's instance.
      * @param apiToken  The API end point.
-     * @param ircServer The IRC server.
      */
-    Pinboard(final Mobibot bot, final String apiToken, final String ircServer) {
+    Pinboard(final Mobibot bot, final String apiToken) {
         pinboard = new PinboardPoster(apiToken);
-        this.ircServer = ircServer;
+        ircServer = bot.getIrcServer();
 
         if (bot.getLogger().isDebugEnabled()) {
             final ConsoleHandler consoleHandler = new ConsoleHandler();

From 30b7a80c494f67bfe44f8807362d824e66e53b65 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 18:00:25 -0700
Subject: [PATCH 023/262] Added response on no matches.

---
 src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index 94ef295..a99a3f6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -115,6 +115,8 @@ class View : AbstractCommand() {
                 )
             }
         }
-
+        if (sent == 0) {
+            bot.send(sender, "No matches. Please try again.", false)
+        }
     }
 }

From cfdbfca0a2ba7a3ad07949a5523f076f3c45588d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 18:00:57 -0700
Subject: [PATCH 024/262] Using StringUtils upper/lowerCase().

---
 src/main/java/net/thauvin/erik/mobibot/Mobibot.java | 13 +++++++------
 .../java/net/thauvin/erik/mobibot/Pinboard.java     |  2 +-
 .../net/thauvin/erik/mobibot/commands/links/View.kt |  3 +--
 .../net/thauvin/erik/mobibot/entries/EntryLink.java |  5 ++---
 .../erik/mobibot/modules/CurrencyConverter.java     | 10 ++++++----
 .../net/thauvin/erik/mobibot/modules/WorldTime.java |  5 ++---
 .../erik/mobibot/modules/LocalProperties.java       |  4 ++--
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index cf460ea..4907b96 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -102,6 +102,7 @@ import java.util.Set;
 import java.util.Timer;
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.lowerCase;
 
 /**
  * Implements the #mobitopia bot.
@@ -360,7 +361,7 @@ public class Mobibot extends PircBot {
                 System.exit(1);
             }
 
-            final String nickname = p.getProperty("nick", Mobibot.class.getName().toLowerCase(Constants.LOCALE));
+            final String nickname = p.getProperty("nick", lowerCase(Mobibot.class.getName()));
             final String channel = p.getProperty("channel");
             final String logsDir = Utils.ensureDir(p.getProperty("logs", "."), false);
 
@@ -567,8 +568,8 @@ public class Mobibot extends PircBot {
 
         for (final char c : getNick().toCharArray()) {
             if (Character.isLetter(c)) {
-                buff.append('[').append(String.valueOf(c).toLowerCase(Constants.LOCALE)).append(
-                        String.valueOf(c).toUpperCase(Constants.LOCALE)).append(']');
+                buff.append('[').append(lowerCase(String.valueOf(c))).append(StringUtils.upperCase(String.valueOf(c)))
+                    .append(']');
             } else {
                 buff.append(c);
             }
@@ -697,7 +698,7 @@ public class Mobibot extends PircBot {
         if (StringUtils.isBlank(topic)) {
             helpDefault(sender, isOp, isPrivate);
         } else {
-            final String lcTopic = topic.toLowerCase(Constants.LOCALE).trim();
+            final String lcTopic = lowerCase(topic).trim();
             if (lcTopic.equals(getChannelName())) {
                 send(sender, "To list the last 5 posts from the channel's weblog:", isPrivate);
                 send(sender, Utils.helpIndent(getNick() + ": " + getChannelName()), isPrivate);
@@ -783,7 +784,7 @@ public class Mobibot extends PircBot {
             isCommand = true;
 
             final String[] cmds = message.substring(message.indexOf(':') + 1).trim().split(" ", 2);
-            final String cmd = cmds[0].toLowerCase(Constants.LOCALE);
+            final String cmd = lowerCase(cmds[0]);
 
             String args = "";
 
@@ -850,7 +851,7 @@ public class Mobibot extends PircBot {
         }
 
         final String[] cmds = message.split(" ", 2);
-        final String cmd = cmds[0].toLowerCase(Constants.LOCALE);
+        final String cmd = lowerCase(cmds[0]);
         String args = "";
 
         if (cmds.length > 1) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java b/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
index 58dac14..61e58d8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
@@ -35,7 +35,7 @@ package net.thauvin.erik.mobibot;
 import net.thauvin.erik.mobibot.entries.EntryLink;
 import net.thauvin.erik.pinboard.PinboardPoster;
 
-import javax.swing.SwingWorker;
+import javax.swing.*;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index a99a3f6..c670a60 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -32,7 +32,6 @@
 
 package net.thauvin.erik.mobibot.commands.links
 
-import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.AbstractCommand
@@ -73,7 +72,7 @@ class View : AbstractCommand() {
 
     private fun showPosts(bot: Mobibot, args: String, sender: String) {
         val max = entriesCount
-        var lcArgs = args.toLowerCase(Constants.LOCALE)
+        var lcArgs = args.toLowerCase()
         var i = 0
         if (lcArgs.isEmpty() && max > maxEntries) {
             i = max - maxEntries
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
index 6e95c0c..af6986a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
@@ -35,7 +35,6 @@ package net.thauvin.erik.mobibot.entries;
 import com.rometools.rome.feed.synd.SyndCategory;
 import com.rometools.rome.feed.synd.SyndCategoryImpl;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Constants;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
@@ -361,7 +360,7 @@ public class EntryLink implements Serializable {
 
                 if (part.length() >= 2) {
                     tag = new SyndCategoryImpl();
-                    tag.setName(part.substring(1).toLowerCase(Constants.LOCALE));
+                    tag.setName(StringUtils.lowerCase(part.substring(1)));
 
                     mod = part.charAt(0);
 
@@ -375,7 +374,7 @@ public class EntryLink implements Serializable {
                             this.tags.add(tag);
                         }
                     } else {
-                        tag.setName(part.trim().toLowerCase(Constants.LOCALE));
+                        tag.setName(StringUtils.lowerCase(part.trim()));
 
                         if (!this.tags.contains(tag)) {
                             this.tags.add(tag);
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
index c9cfba1..1fd2c7c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
@@ -55,6 +55,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import static org.apache.commons.lang3.StringUtils.upperCase;
+
 /**
  * The CurrentConverter module.
  *
@@ -100,8 +102,8 @@ public final class CurrencyConverter extends ThreadedModule {
             if (cmds[3].equals(cmds[1]) || "0".equals(cmds[0])) {
                 return new PublicMessage("You're kidding, right?");
             } else {
-                final String to = cmds[1].toUpperCase(Constants.LOCALE);
-                final String from = cmds[3].toUpperCase(Constants.LOCALE);
+                final String to = upperCase(cmds[1]);
+                final String from = upperCase(cmds[3]);
 
                 if (EXCHANGE_RATES.containsKey(to) && EXCHANGE_RATES.containsKey(from)) {
                     try {
@@ -112,13 +114,13 @@ public final class CurrencyConverter extends ThreadedModule {
                         return new PublicMessage(
                                 NumberFormat.getCurrencyInstance(Constants.LOCALE).format(amt).substring(1)
                                 + ' '
-                                + cmds[1].toUpperCase(Constants.LOCALE)
+                                + upperCase(cmds[1])
                                 + " = "
                                 + NumberFormat.getCurrencyInstance(Constants.LOCALE)
                                               .format((amt * doubleTo) / doubleFrom)
                                               .substring(1)
                                 + ' '
-                                + cmds[3].toUpperCase(Constants.LOCALE));
+                                + upperCase(cmds[3]));
                     } catch (NumberFormatException e) {
                         return new ErrorMessage("Let's try with some real numbers next time, okay?");
                     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
index bac4eb0..74dbc4a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
@@ -33,12 +33,12 @@
 package net.thauvin.erik.mobibot.modules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Constants;
 import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
 import net.thauvin.erik.mobibot.msg.ErrorMessage;
 import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.PublicMessage;
+import org.apache.commons.lang3.StringUtils;
 
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -188,8 +188,7 @@ public final class WorldTime extends AbstractModule {
      */
     @SuppressFBWarnings("STT_STRING_PARSING_A_FIELD")
     static Message worldTime(final String query) {
-        final String tz = (COUNTRIES_MAP.get((query.substring(query.indexOf(' ') + 1).trim()
-                                                   .toUpperCase(Constants.LOCALE))));
+        final String tz = (COUNTRIES_MAP.get((StringUtils.upperCase(query.substring(query.indexOf(' ') + 1).trim()))));
         final String response;
 
         if (tz != null) {
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java b/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java
index 1a62f34..acd9dab 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java
@@ -32,7 +32,7 @@
 
 package net.thauvin.erik.mobibot.modules;
 
-import net.thauvin.erik.mobibot.Constants;
+import org.apache.commons.lang3.StringUtils;
 import org.testng.annotations.BeforeSuite;
 
 import java.io.IOException;
@@ -65,7 +65,7 @@ class LocalProperties {
     }
 
     private static String keyToEnv(final String key) {
-        return key.replace('-', '_').toUpperCase(Constants.LOCALE);
+        return StringUtils.upperCase(key.replace('-', '_'));
     }
 
     @BeforeSuite(alwaysRun = true)

From d9b1cbceffd3ff380c207018d85ce5d2c04d1232 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 19:19:31 -0700
Subject: [PATCH 025/262] Cleanup.

---
 .../net/thauvin/erik/mobibot/FeedReader.java  |   5 +-
 .../net/thauvin/erik/mobibot/Mobibot.java     |   2 +-
 .../net/thauvin/erik/mobibot/Pinboard.java    |   6 +-
 .../erik/mobibot/commands/tell/Tell.java      | 258 ++++++++++--------
 .../erik/mobibot/modules/GoogleSearch.java    |   6 +-
 5 files changed, 144 insertions(+), 133 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
index 99c68bd..9188758 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
@@ -52,9 +52,6 @@ class FeedReader implements Runnable {
     // Maximum number of feed items to display
     private static final int MAX_ITEMS = 5;
 
-    // Tab indent (4 spaces)
-    private static final String TAB_INDENT = "    ";
-
     // Bot
     private final Mobibot bot;
 
@@ -94,7 +91,7 @@ class FeedReader implements Runnable {
                 for (int i = 0; (i < items.size()) && (i < MAX_ITEMS); i++) {
                     item = items.get(i);
                     bot.send(sender, item.getTitle(), false);
-                    bot.send(sender, TAB_INDENT + Utils.green(item.getLink()), false);
+                    bot.send(sender, Utils.helpIndent(Utils.green(item.getLink()), false), false);
                 }
             }
         } catch (MalformedURLException e) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 4907b96..0ed1aa7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -141,7 +141,7 @@ public class Mobibot extends PircBot {
     // Tell object
     public final Tell tell;
     // Commands
-    private final List<AbstractCommand> commands = new ArrayList<>();
+    private final List<AbstractCommand> commands = new ArrayList<>(20);
     // Commands Names
     private final List<String> commandsNames = new ArrayList<>();
     // Main channel
diff --git a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java b/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
index 61e58d8..0291ff3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
@@ -35,7 +35,7 @@ package net.thauvin.erik.mobibot;
 import net.thauvin.erik.mobibot.entries.EntryLink;
 import net.thauvin.erik.pinboard.PinboardPoster;
 
-import javax.swing.*;
+import javax.swing.SwingWorker;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -58,8 +58,8 @@ class Pinboard {
     /**
      * Creates a new {@link Pinboard} instance.
      *
-     * @param bot       The bot's instance.
-     * @param apiToken  The API end point.
+     * @param bot      The bot's instance.
+     * @param apiToken The API end point.
      */
     Pinboard(final Mobibot bot, final String apiToken) {
         pinboard = new PinboardPoster(apiToken);
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index 44938bf..5d7ba31 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -32,7 +32,6 @@
 
 package net.thauvin.erik.mobibot.commands.tell;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
 import net.thauvin.erik.mobibot.commands.links.View;
@@ -53,7 +52,8 @@ public class Tell {
      * The tell command.
      */
     public static final String TELL_CMD = "tell";
-
+    // Arrow
+    private static final String ARROW = " --> ";
     // Default maximum number of days to keep messages
     private static final int DEFAULT_TELL_MAX_DAYS = 7;
     // Default message max queue size
@@ -64,7 +64,6 @@ public class Tell {
     private static final String TELL_ALL_KEYWORD = "all";
     //T he delete command.
     private static final String TELL_DEL_KEYWORD = "del";
-
     // Bot instance
     private final Mobibot bot;
     // Maximum number of days to keep messages
@@ -111,6 +110,58 @@ public class Tell {
         return TellMessagesMgr.clean(messages, maxDays);
     }
 
+    // Delete message.
+    private void deleteMessage(final String sender, final String cmds, final boolean isPrivate) {
+        final String[] split = cmds.split(" ");
+
+        if (split.length == 2) {
+            final String id = split[1];
+            boolean deleted = false;
+
+            if (TELL_ALL_KEYWORD.equalsIgnoreCase(id)) {
+                for (final TellMessage message : messages) {
+                    if (message.getSender().equalsIgnoreCase(sender) && message.isReceived()) {
+                        messages.remove(message);
+                        deleted = true;
+                    }
+                }
+
+                if (deleted) {
+                    save();
+                    bot.send(sender, "Delivered messages have been deleted.", isPrivate);
+                } else {
+                    bot.send(sender, "No delivered messages were found.", isPrivate);
+                }
+
+            } else {
+                boolean found = false;
+
+                for (final TellMessage message : messages) {
+                    found = message.isMatchId(id);
+
+                    if (found && (message.getSender().equalsIgnoreCase(sender) || bot.isOp(sender))) {
+                        messages.remove(message);
+
+                        save();
+                        bot.send(sender, "Your message was deleted from the queue.", isPrivate);
+                        deleted = true;
+                        break;
+                    }
+                }
+
+                if (!deleted) {
+                    if (found) {
+                        bot.send(sender, "Only messages that you sent can be deleted.", isPrivate);
+                    } else {
+                        bot.send(sender, "The specified message [ID " + id + "] could not be found.", isPrivate);
+                    }
+                }
+            }
+        } else {
+            helpResponse(sender, isPrivate);
+        }
+    }
+
     /**
      * Responds with Constants.
      *
@@ -138,6 +189,28 @@ public class Tell {
         return maxSize > 0 && maxDays > 0;
     }
 
+    // New message.
+    private void newMessage(final String sender, final String cmds, final boolean isPrivate) {
+        final String[] split = cmds.split(" ", 2);
+
+        if (split.length == 2 && (StringUtils.isNotBlank(split[1]) && split[1].contains(" "))) {
+            if (messages.size() < maxSize) {
+                final TellMessage message = new TellMessage(sender, split[0], split[1].trim());
+
+                messages.add(message);
+
+                save();
+
+                bot.send(sender, "Message [ID " + message.getId() + "] was queued for "
+                                 + Utils.bold(message.getRecipient()), true);
+            } else {
+                bot.send(sender, "Sorry, the messages queue is currently full.", true);
+            }
+        } else {
+            helpResponse(sender, isPrivate);
+        }
+    }
+
     /**
      * Processes the commands.
      *
@@ -145,133 +218,19 @@ public class Tell {
      * @param cmds      The commands string.
      * @param isPrivate The private flag.
      */
-    @SuppressFBWarnings(value = "CC_CYCLOMATIC_COMPLEXITY",
-                        justification = "Working on it.")
     public void response(final String sender, final String cmds, final boolean isPrivate) {
-        final String arrow = " --> ";
         if (StringUtils.isBlank(cmds)) {
             helpResponse(sender, isPrivate);
         } else if (cmds.startsWith(View.VIEW_CMD)) {
             if (bot.isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(cmds)) {
-                if (!messages.isEmpty()) {
-                    for (final TellMessage message : messages) {
-                        bot.send(sender, Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
-                                         + " [ID: " + message.getId() + ", "
-                                         + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
-                                 isPrivate);
-                    }
-                } else {
-                    bot.send(sender, "There are no messages in the queue.", isPrivate);
-                }
+                viewAll(sender, isPrivate);
             } else {
-                boolean hasMessage = false;
-
-                for (final TellMessage message : messages) {
-                    if (message.isMatch(sender)) {
-                        if (!hasMessage) {
-                            hasMessage = true;
-                            bot.send(sender, "Here are your messages: ", isPrivate);
-                        }
-
-                        if (message.isReceived()) {
-                            bot.send(sender,
-                                     Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
-                                     + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
-                                     + message.getId() + ", DELIVERED]",
-                                     isPrivate);
-
-                        } else {
-                            bot.send(sender,
-                                     Utils.bold(message.getSender()) + arrow + Utils.bold(message.getRecipient())
-                                     + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
-                                     + message.getId() + ", QUEUED]",
-                                     isPrivate);
-                        }
-
-                        bot.send(sender, Utils.helpIndent(message.getMessage()), isPrivate);
-                    }
-                }
-
-                if (!hasMessage) {
-                    bot.send(sender, "You have no messages in the queue.", isPrivate);
-                } else {
-                    bot.send(sender, "To delete one or all delivered messages:", isPrivate);
-                    bot.send(sender,
-                             Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
-                                              + TELL_ALL_KEYWORD + '>'), isPrivate);
-                    bot.send(sender,
-                             "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
-                             isPrivate);
-                }
+                viewMessages(sender, isPrivate);
             }
         } else if (cmds.startsWith(TELL_DEL_KEYWORD + ' ')) {
-            final String[] split = cmds.split(" ");
-
-            if (split.length == 2) {
-                final String id = split[1];
-                boolean deleted = false;
-
-                if (TELL_ALL_KEYWORD.equalsIgnoreCase(id)) {
-                    for (final TellMessage message : messages) {
-                        if (message.getSender().equalsIgnoreCase(sender) && message.isReceived()) {
-                            messages.remove(message);
-                            deleted = true;
-                        }
-                    }
-
-                    if (deleted) {
-                        save();
-                        bot.send(sender, "Delivered messages have been deleted.", isPrivate);
-                    } else {
-                        bot.send(sender, "No delivered messages were found.", isPrivate);
-                    }
-
-                } else {
-                    boolean found = false;
-
-                    for (final TellMessage message : messages) {
-                        found = message.isMatchId(id);
-
-                        if (found && (message.getSender().equalsIgnoreCase(sender) || bot.isOp(sender))) {
-                            messages.remove(message);
-
-                            save();
-                            bot.send(sender, "Your message was deleted from the queue.", isPrivate);
-                            deleted = true;
-                            break;
-                        }
-                    }
-
-                    if (!deleted) {
-                        if (found) {
-                            bot.send(sender, "Only messages that you sent can be deleted.", isPrivate);
-                        } else {
-                            bot.send(sender, "The specified message [ID " + id + "] could not be found.", isPrivate);
-                        }
-                    }
-                }
-            } else {
-                helpResponse(sender, isPrivate);
-            }
+            deleteMessage(sender, cmds, isPrivate);
         } else {
-            final String[] split = cmds.split(" ", 2);
-
-            if (split.length == 2 && (StringUtils.isNotBlank(split[1]) && split[1].contains(" "))) {
-                if (messages.size() < maxSize) {
-                    final TellMessage message = new TellMessage(sender, split[0], split[1].trim());
-
-                    messages.add(message);
-
-                    save();
-
-                    bot.send(sender, "Message [ID " + message.getId() + "] was queued for "
-                                     + Utils.bold(message.getRecipient()), true);
-                } else {
-                    bot.send(sender, "Sorry, the messages queue is currently full.", true);
-                }
-            } else {
-                helpResponse(sender, isPrivate);
-            }
+            newMessage(sender, cmds, isPrivate);
         }
 
         if (clean()) {
@@ -351,4 +310,61 @@ public class Tell {
     public int size() {
         return messages.size();
     }
+
+    // View all messages.
+    private void viewAll(final String sender, final boolean isPrivate) {
+        if (!messages.isEmpty()) {
+            for (final TellMessage message : messages) {
+                bot.send(sender, Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
+                                 + " [ID: " + message.getId() + ", "
+                                 + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
+                         isPrivate);
+            }
+        } else {
+            bot.send(sender, "There are no messages in the queue.", isPrivate);
+        }
+    }
+
+    // View messages.
+    private void viewMessages(final String sender, final boolean isPrivate) {
+        boolean hasMessage = false;
+
+        for (final TellMessage message : messages) {
+            if (message.isMatch(sender)) {
+                if (!hasMessage) {
+                    hasMessage = true;
+                    bot.send(sender, "Here are your messages: ", isPrivate);
+                }
+
+                if (message.isReceived()) {
+                    bot.send(sender,
+                             Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
+                             + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
+                             + Utils.bold(message.getId()) + ", DELIVERED]",
+                             isPrivate);
+
+                } else {
+                    bot.send(sender,
+                             Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
+                             + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
+                             + Utils.bold(message.getId()) + ", QUEUED]",
+                             isPrivate);
+                }
+
+                bot.send(sender, Utils.helpIndent(message.getMessage()), isPrivate);
+            }
+        }
+
+        if (!hasMessage) {
+            bot.send(sender, "You have no messages in the queue.", isPrivate);
+        } else {
+            bot.send(sender, "To delete one or all delivered messages:", isPrivate);
+            bot.send(sender,
+                     Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
+                                      + TELL_ALL_KEYWORD + '>'), isPrivate);
+            bot.send(sender,
+                     "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
+                     isPrivate);
+        }
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
index 9e92783..e8b6597 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
@@ -66,8 +66,6 @@ public final class GoogleSearch extends ThreadedModule {
     static final String GOOGLE_CSE_KEY_PROP = "google-cse-cx";
     // Google command
     private static final String GOOGLE_CMD = "google";
-    // Tab indent (4 spaces)
-    private static final String TAB_INDENT = "    ";
 
     /**
      * Creates a new {@link GoogleSearch} instance.
@@ -126,7 +124,7 @@ public final class GoogleSearch extends ThreadedModule {
                         final JSONObject j = ja.getJSONObject(i);
                         results.add(new NoticeMessage(Utils.unescapeXml(j.getString("title"))));
                         results.add(
-                                new NoticeMessage(TAB_INDENT + j.getString("link"), Colors.DARK_GREEN));
+                                new NoticeMessage(Utils.helpIndent(j.getString("link"), false), Colors.DARK_GREEN));
                     }
                 }
             } catch (IOException e) {
@@ -135,7 +133,7 @@ public final class GoogleSearch extends ThreadedModule {
 
             return results;
         } else {
-            throw new ModuleException("Invalid query.");
+            throw new ModuleException("Invalid query. Please try again.");
         }
     }
 

From 0ec1e751069d41c2fe8b9f5d418a826a5209d603 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 21:58:54 -0700
Subject: [PATCH 026/262] Made Tell an actual command.

---
 .../net/thauvin/erik/mobibot/Mobibot.java     |  18 +--
 .../erik/mobibot/commands/tell/Tell.java      | 120 ++++++++++--------
 2 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 0ed1aa7..a7d83c1 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -258,6 +258,9 @@ public class Mobibot extends PircBot {
         commands.add(new Comment());
         commands.add(new Posting());
         commands.add(new Tags());
+        // Get the tell command settings
+        tell = new Tell(this, p.getProperty("tell-max-days"), p.getProperty("tell-max-size"));
+        commands.add(tell);
         commands.add(new UrlMgr(p.getProperty("tags", ""), p.getProperty("tags-keywords", "")));
         commands.add(new View());
 
@@ -290,9 +293,6 @@ public class Mobibot extends PircBot {
             }
         });
 
-        // Get the tell command settings
-        tell = new Tell(this, p.getProperty("tell-max-days"), p.getProperty("tell-max-size"));
-
         // Save the entries
         UrlMgr.saveEntries(this, true);
     }
@@ -624,8 +624,7 @@ public class Mobibot extends PircBot {
         send(sender, "Type a URL on " + ircChannel + " to post it.", isPrivate);
         send(sender, "For more information on a specific command, type:", isPrivate);
         send(sender,
-             Utils.helpIndent(
-                     ((isPrivate) ? "/msg " + getNick() : getNick() + ':') + " " + Constants.HELP_CMD + " <command>"),
+             Utils.helpIndent(Utils.botCommand(getNick(), isPrivate) + Constants.HELP_CMD + " <command>"),
              isPrivate);
         send(sender, "The commands are:", isPrivate);
 
@@ -702,8 +701,6 @@ public class Mobibot extends PircBot {
             if (lcTopic.equals(getChannelName())) {
                 send(sender, "To list the last 5 posts from the channel's weblog:", isPrivate);
                 send(sender, Utils.helpIndent(getNick() + ": " + getChannelName()), isPrivate);
-            } else if (Tell.TELL_CMD.equals(lcTopic) && tell.isEnabled()) {
-                tell.helpResponse(sender, isPrivate);
             } else {
                 // Command, Modules or Default
                 if (!helpCommands(sender, topic, isPrivate) && !helpModules(sender, lcTopic, isPrivate)) {
@@ -796,8 +793,6 @@ public class Mobibot extends PircBot {
                 helpResponse(sender, args, false);
             } else if (cmd.equalsIgnoreCase(getChannelName())) { // mobibot: <channel>
                 feedResponse(sender);
-            } else if (cmd.startsWith(Tell.TELL_CMD) && tell.isEnabled()) { // mobibot: tell
-                tell.response(sender, args, false);
             } else {
                 boolean skip = false;
                 // Commands
@@ -820,8 +815,7 @@ public class Mobibot extends PircBot {
                     }
                 }
             }
-        } else {
-            // Commands
+        } else { // Commands
             for (final AbstractCommand command : commands) {
                 if (command.matches(message)) {
                     command.commandResponse(this, sender, login, message, isOp(sender), false);
@@ -880,8 +874,6 @@ public class Mobibot extends PircBot {
             sleep(3);
             quitServer("The Bot Is Out There!");
             System.exit(0);
-        } else if (Tell.TELL_CMD.equals(cmd) && tell.isEnabled()) { // tell
-            tell.response(sender, args, true);
         } else {
             for (final AbstractCommand command : commands) {
                 if (command.getCommand().startsWith(cmd)) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index 5d7ba31..c42fbf2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -34,8 +34,10 @@ package net.thauvin.erik.mobibot.commands.tell;
 
 import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
+import net.thauvin.erik.mobibot.commands.AbstractCommand;
 import net.thauvin.erik.mobibot.commands.links.View;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -47,7 +49,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * @created 2016-07-02
  * @since 1.0
  */
-public class Tell {
+public class Tell extends AbstractCommand {
     /**
      * The tell command.
      */
@@ -111,8 +113,8 @@ public class Tell {
     }
 
     // Delete message.
-    private void deleteMessage(final String sender, final String cmds, final boolean isPrivate) {
-        final String[] split = cmds.split(" ");
+    private void deleteMessage(final String sender, final String args, final boolean isOp, final boolean isPrivate) {
+        final String[] split = args.split(" ");
 
         if (split.length == 2) {
             final String id = split[1];
@@ -158,26 +160,65 @@ public class Tell {
                 }
             }
         } else {
-            helpResponse(sender, isPrivate);
+            helpResponse(bot, args, sender, isOp, isPrivate);
         }
     }
 
-    /**
-     * Responds with Constants.
-     *
-     * @param sender    The sender.
-     * @param isPrivate The private flag.
-     */
-    public void helpResponse(final String sender, final boolean isPrivate) {
-        bot.send(sender, "To send a message to someone when they join the channel:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + " <nick> <message>"), isPrivate);
+    @NotNull
+    @Override
+    public String getCommand() {
+        return TELL_CMD;
+    }
 
-        bot.send(sender, "To view queued and sent messages:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + View.VIEW_CMD), isPrivate);
+    @NotNull
+    @Override
+    public List<String> getHelp() {
+        return List.of("To send a message to someone when they join the channel:",
+                       Utils.helpIndent("%s " + TELL_CMD + " <nick> <message>"),
+                       "To view queued and sent messages:",
+                       Utils.helpIndent("%s " + TELL_CMD + ' ' + View.VIEW_CMD),
+                       "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."));
+    }
 
-        bot.send(sender,
-                 "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
-                 isPrivate);
+    @Override
+    public boolean isOp() {
+        return false;
+    }
+
+    @Override
+    public boolean isPublic() {
+        return true;
+    }
+
+    @Override
+    public boolean isVisible() {
+        return true;
+    }
+
+    @Override
+    public void commandResponse(@NotNull final Mobibot bot,
+                                @NotNull final String sender,
+                                @NotNull final String login,
+                                @NotNull final String args,
+                                final boolean isOp,
+                                final boolean isPrivate) {
+        if (StringUtils.isBlank(args)) {
+            helpResponse(bot, args, sender, isOp, isPrivate);
+        } else if (args.startsWith(View.VIEW_CMD)) {
+            if (bot.isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(args)) {
+                viewAll(sender, isPrivate);
+            } else {
+                viewMessages(sender, isPrivate);
+            }
+        } else if (args.startsWith(TELL_DEL_KEYWORD + ' ')) {
+            deleteMessage(sender, args, isOp, isPrivate);
+        } else {
+            newMessage(sender, args, isOp, isPrivate);
+        }
+
+        if (clean()) {
+            save();
+        }
     }
 
     /**
@@ -190,8 +231,8 @@ public class Tell {
     }
 
     // New message.
-    private void newMessage(final String sender, final String cmds, final boolean isPrivate) {
-        final String[] split = cmds.split(" ", 2);
+    private void newMessage(final String sender, final String args, final boolean isOp, final boolean isPrivate) {
+        final String[] split = args.split(" ", 2);
 
         if (split.length == 2 && (StringUtils.isNotBlank(split[1]) && split[1].contains(" "))) {
             if (messages.size() < maxSize) {
@@ -202,39 +243,12 @@ public class Tell {
                 save();
 
                 bot.send(sender, "Message [ID " + message.getId() + "] was queued for "
-                                 + Utils.bold(message.getRecipient()), true);
+                                 + Utils.bold(message.getRecipient()), isPrivate);
             } else {
-                bot.send(sender, "Sorry, the messages queue is currently full.", true);
+                bot.send(sender, "Sorry, the messages queue is currently full.", isPrivate);
             }
         } else {
-            helpResponse(sender, isPrivate);
-        }
-    }
-
-    /**
-     * Processes the commands.
-     *
-     * @param sender    The sender's nick.
-     * @param cmds      The commands string.
-     * @param isPrivate The private flag.
-     */
-    public void response(final String sender, final String cmds, final boolean isPrivate) {
-        if (StringUtils.isBlank(cmds)) {
-            helpResponse(sender, isPrivate);
-        } else if (cmds.startsWith(View.VIEW_CMD)) {
-            if (bot.isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(cmds)) {
-                viewAll(sender, isPrivate);
-            } else {
-                viewMessages(sender, isPrivate);
-            }
-        } else if (cmds.startsWith(TELL_DEL_KEYWORD + ' ')) {
-            deleteMessage(sender, cmds, isPrivate);
-        } else {
-            newMessage(sender, cmds, isPrivate);
-        }
-
-        if (clean()) {
-            save();
+            helpResponse(bot, args, sender, isOp, isPrivate);
         }
     }
 
@@ -360,8 +374,10 @@ public class Tell {
         } else {
             bot.send(sender, "To delete one or all delivered messages:", isPrivate);
             bot.send(sender,
-                     Utils.helpIndent(bot.getNick() + ": " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
-                                      + TELL_ALL_KEYWORD + '>'), isPrivate);
+                     Utils.helpIndent(
+                             Utils.botCommand(bot.getNick(), isPrivate) + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
+                             + TELL_ALL_KEYWORD + '>'),
+                     isPrivate);
             bot.send(sender,
                      "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
                      isPrivate);

From 37f3c4941386a3844282b0638197a724e7a73939 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 30 Mar 2020 21:59:23 -0700
Subject: [PATCH 027/262] Added Utils.botCommand().

---
 src/main/java/net/thauvin/erik/mobibot/Constants.java  |  8 ++++++++
 src/main/java/net/thauvin/erik/mobibot/Utils.java      | 10 ++++++++++
 .../thauvin/erik/mobibot/commands/AbstractCommand.kt   |  8 ++------
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.java b/src/main/java/net/thauvin/erik/mobibot/Constants.java
index 9943398..d985b72 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.java
@@ -42,6 +42,14 @@ import java.util.Locale;
  * @since 1.0
  */
 public final class Constants {
+    /**
+     * The bot's private message command format.
+     */
+    public static final String BOT_PRIVATE_CMD = "/msg %s ";
+    /**
+     * The bot's public message command format.
+     */
+    public static final String BOT_PUB_CMD = "%s: ";
     /**
      * The connect/read timeout in ms.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java
index 67c81c8..07767a5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.java
@@ -335,4 +335,14 @@ public final class Utils {
     public static String utcDateTime(final LocalDateTime date) {
         return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
     }
+
+    public static String botCommand(final String name, boolean isPrivate) {
+        if (isPrivate) {
+            return String.format(Constants.BOT_PRIVATE_CMD, name);
+        } else {
+            return String.format(Constants.BOT_PUB_CMD, name);
+        }
+
+    }
+
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 4b42bc3..bcafa66 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -33,6 +33,7 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
 
 abstract class AbstractCommand {
     abstract val command: String
@@ -53,12 +54,7 @@ abstract class AbstractCommand {
     open fun helpResponse(bot: Mobibot, command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
         if (!this.isOp || this.isOp == isOp) {
             for (h in help) {
-                if (isPrivate) {
-                    bot.send(sender, String.format(h, "/msg ${bot.nick}"), true)
-                } else if (isPublic) {
-                    bot.send(sender, String.format(h, "${bot.nick}:"), false)
-                }
-
+                bot.send(sender, String.format(h, Utils.botCommand(bot.nick, isPrivate)), isPrivate)
             }
             return true
         }

From 559634fbfee5cba0e8e7906b9265f6edc4bb739a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 31 Mar 2020 22:30:09 -0700
Subject: [PATCH 028/262] Converted Tell to an actual command.

---
 .../net/thauvin/erik/mobibot/Mobibot.java     | 27 ++++++++-------
 .../erik/mobibot/commands/tell/Tell.java      | 33 ++++++++++---------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index a7d83c1..7e5dd16 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -254,17 +254,19 @@ public class Mobibot extends PircBot {
         commands.add(new Users());
         commands.add(new Versions());
 
+        // Tell
+        tell = new Tell(this, p.getProperty("tell-max-days"), p.getProperty("tell-max-size"));
+        if (tell.isEnabled()) {
+            commands.add(tell);
+        }
+
         // Load the links commands
         commands.add(new Comment());
         commands.add(new Posting());
         commands.add(new Tags());
-        // Get the tell command settings
-        tell = new Tell(this, p.getProperty("tell-max-days"), p.getProperty("tell-max-size"));
-        commands.add(tell);
         commands.add(new UrlMgr(p.getProperty("tags", ""), p.getProperty("tags-keywords", "")));
         commands.add(new View());
 
-
         // Load the modules
         addModule(new Calc());
         addModule(new CurrencyConverter());
@@ -647,11 +649,6 @@ public class Mobibot extends PircBot {
             modules.stream().filter(AbstractModule::isEnabled)
                    .forEach(module -> commandsNames.addAll(module.getCommands()));
 
-            // Tell command
-            if (tell.isEnabled()) {
-                commandsNames.add(Tell.TELL_CMD);
-            }
-
             Collections.sort(commandsNames);
             Collections.sort(opsCommandsNames);
         }
@@ -829,7 +826,9 @@ public class Mobibot extends PircBot {
             Recap.storeRecap(sender, message, false);
         }
 
-        tell.send(sender, true);
+        if (tell.isEnabled()) {
+            tell.send(sender, true);
+        }
     }
 
     /**
@@ -911,7 +910,9 @@ public class Mobibot extends PircBot {
      */
     @Override
     protected void onJoin(final String channel, final String sender, final String login, final String hostname) {
-        tell.send(sender);
+        if (tell.isEnabled()) {
+            tell.send(sender);
+        }
     }
 
     /**
@@ -919,7 +920,9 @@ public class Mobibot extends PircBot {
      */
     @Override
     protected void onNickChange(final String oldNick, final String login, final String hostname, final String newNick) {
-        tell.send(newNick);
+        if (tell.isEnabled()) {
+            tell.send(newNick);
+        }
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index c42fbf2..46bbd27 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -85,6 +85,7 @@ public class Tell extends AbstractCommand {
      * @param maxSize Max size.
      */
     public Tell(final Mobibot bot, final String maxDays, final String maxSize) {
+        super();
         this.bot = bot;
         this.maxDays = Utils.getIntProperty(maxDays, DEFAULT_TELL_MAX_DAYS);
         this.maxSize = Utils.getIntProperty(maxSize, DEFAULT_TELL_MAX_SIZE);
@@ -187,12 +188,12 @@ public class Tell extends AbstractCommand {
 
     @Override
     public boolean isPublic() {
-        return true;
+        return isEnabled();
     }
 
     @Override
     public boolean isVisible() {
-        return true;
+        return isEnabled();
     }
 
     @Override
@@ -202,22 +203,24 @@ public class Tell extends AbstractCommand {
                                 @NotNull final String args,
                                 final boolean isOp,
                                 final boolean isPrivate) {
-        if (StringUtils.isBlank(args)) {
-            helpResponse(bot, args, sender, isOp, isPrivate);
-        } else if (args.startsWith(View.VIEW_CMD)) {
-            if (bot.isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(args)) {
-                viewAll(sender, isPrivate);
+        if (isEnabled()) {
+            if (StringUtils.isBlank(args)) {
+                helpResponse(bot, args, sender, isOp, isPrivate);
+            } else if (args.startsWith(View.VIEW_CMD)) {
+                if (bot.isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(args)) {
+                    viewAll(sender, isPrivate);
+                } else {
+                    viewMessages(sender, isPrivate);
+                }
+            } else if (args.startsWith(TELL_DEL_KEYWORD + ' ')) {
+                deleteMessage(sender, args, isOp, isPrivate);
             } else {
-                viewMessages(sender, isPrivate);
+                newMessage(sender, args, isOp, isPrivate);
             }
-        } else if (args.startsWith(TELL_DEL_KEYWORD + ' ')) {
-            deleteMessage(sender, args, isOp, isPrivate);
-        } else {
-            newMessage(sender, args, isOp, isPrivate);
-        }
 
-        if (clean()) {
-            save();
+            if (clean()) {
+                save();
+            }
         }
     }
 

From d2339044e64b36ca925ebc3cd838dde5a6f820d9 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 31 Mar 2020 22:34:35 -0700
Subject: [PATCH 029/262] Added helpFormat.

---
 .../net/thauvin/erik/mobibot/Constants.java   |  8 ------
 .../net/thauvin/erik/mobibot/Mobibot.java     |  2 +-
 .../java/net/thauvin/erik/mobibot/Utils.java  | 25 ++++++++++++-------
 .../erik/mobibot/commands/AbstractCommand.kt  |  2 +-
 .../thauvin/erik/mobibot/commands/Cycle.kt    |  2 +-
 .../thauvin/erik/mobibot/commands/Ignore.kt   | 16 ++++++------
 .../net/thauvin/erik/mobibot/commands/Info.kt |  2 +-
 .../net/thauvin/erik/mobibot/commands/Me.kt   |  2 +-
 .../thauvin/erik/mobibot/commands/Modules.kt  |  2 +-
 .../net/thauvin/erik/mobibot/commands/Msg.kt  |  2 +-
 .../net/thauvin/erik/mobibot/commands/Nick.kt |  2 +-
 .../thauvin/erik/mobibot/commands/Recap.kt    |  4 +--
 .../net/thauvin/erik/mobibot/commands/Say.kt  |  2 +-
 .../thauvin/erik/mobibot/commands/Users.kt    |  2 +-
 .../erik/mobibot/commands/links/Comment.kt    |  6 ++++-
 .../erik/mobibot/commands/links/Posting.kt    |  2 +-
 .../erik/mobibot/commands/links/View.kt       |  2 +-
 .../erik/mobibot/commands/tell/Tell.java      |  7 +++---
 .../erik/mobibot/modules/AbstractModule.java  | 15 +++++++----
 .../thauvin/erik/mobibot/modules/Calc.java    | 13 +++-------
 .../mobibot/modules/CurrencyConverter.java    | 11 +++++---
 .../thauvin/erik/mobibot/modules/Dice.java    | 13 +++-------
 .../erik/mobibot/modules/GoogleSearch.java    | 18 ++++---------
 .../thauvin/erik/mobibot/modules/Joke.java    | 13 +++-------
 .../thauvin/erik/mobibot/modules/Lookup.java  | 13 +++-------
 .../thauvin/erik/mobibot/modules/Ping.java    | 13 +++-------
 .../erik/mobibot/modules/RockPaperScissors.kt | 24 ++++++++----------
 .../erik/mobibot/modules/StockQuote.java      | 13 +++-------
 .../thauvin/erik/mobibot/modules/Twitter.java | 18 ++++---------
 .../net/thauvin/erik/mobibot/modules/War.java | 13 +++-------
 .../erik/mobibot/modules/Weather2.java        | 24 ++++++------------
 .../erik/mobibot/modules/WorldTime.java       | 20 ++++++---------
 32 files changed, 129 insertions(+), 182 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.java b/src/main/java/net/thauvin/erik/mobibot/Constants.java
index d985b72..9943398 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.java
@@ -42,14 +42,6 @@ import java.util.Locale;
  * @since 1.0
  */
 public final class Constants {
-    /**
-     * The bot's private message command format.
-     */
-    public static final String BOT_PRIVATE_CMD = "/msg %s ";
-    /**
-     * The bot's public message command format.
-     */
-    public static final String BOT_PUB_CMD = "%s: ";
     /**
      * The connect/read timeout in ms.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 7e5dd16..e06b661 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -626,7 +626,7 @@ public class Mobibot extends PircBot {
         send(sender, "Type a URL on " + ircChannel + " to post it.", isPrivate);
         send(sender, "For more information on a specific command, type:", isPrivate);
         send(sender,
-             Utils.helpIndent(Utils.botCommand(getNick(), isPrivate) + Constants.HELP_CMD + " <command>"),
+             Utils.helpIndent(Utils.helpFormat("%c " + Constants.HELP_CMD + " <command>", getNick(), isPrivate)),
              isPrivate);
         send(sender, "The commands are:", isPrivate);
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java
index 07767a5..e4f582a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.java
@@ -51,6 +51,8 @@ import java.util.concurrent.TimeUnit;
  * @since 1.0
  */
 public final class Utils {
+    private static final String[] searchFlags = { "%c", "%n" };
+
     /**
      * Disables the default constructor.
      *
@@ -159,6 +161,20 @@ public final class Utils {
         return colorize(s, Colors.DARK_GREEN);
     }
 
+    /**
+     * Formats a help command by replacing {@code %c} with the bot's pub/priv command, and {@code %n} with the bot's
+     * nick.
+     *
+     * @param text      The help command text.
+     * @param botNick   The bot's nick.
+     * @param isPrivate The private flag.
+     * @return The formatted help command.
+     */
+    public static String helpFormat(final String text, final String botNick, final boolean isPrivate) {
+        final String[] replace = { (isPrivate) ? "/msg " + botNick : botNick + ':', botNick };
+        return StringUtils.replaceEach(text, searchFlags, replace);
+    }
+
     /**
      * Returns indented help string.
      *
@@ -336,13 +352,4 @@ public final class Utils {
         return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
     }
 
-    public static String botCommand(final String name, boolean isPrivate) {
-        if (isPrivate) {
-            return String.format(Constants.BOT_PRIVATE_CMD, name);
-        } else {
-            return String.format(Constants.BOT_PUB_CMD, name);
-        }
-
-    }
-
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index bcafa66..99a678c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -54,7 +54,7 @@ abstract class AbstractCommand {
     open fun helpResponse(bot: Mobibot, command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
         if (!this.isOp || this.isOp == isOp) {
             for (h in help) {
-                bot.send(sender, String.format(h, Utils.botCommand(bot.nick, isPrivate)), isPrivate)
+                bot.send(sender, Utils.helpFormat(h, bot.nick, isPrivate), isPrivate)
             }
             return true
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
index 73c2d7c..cfd7938 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -40,7 +40,7 @@ class Cycle : AbstractCommand() {
     override val command = "cycle"
     override val help = listOf(
        "To have the bot leave the channel and come back:",
-        Utils.helpIndent("%s $command")
+        Utils.helpIndent("%c $command")
     )
     override val isOp = true
     override val isPublic = false
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index 6ad42ab..3138b70 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -41,24 +41,24 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
 
     init {
         if (defaultIgnore.isNotBlank()) {
-            ignored.addAll(defaultIgnore.split(", +?| +"))
+            ignored.addAll(defaultIgnore.split(", *| +".toRegex()))
         }
     }
 
     override val command = IGNORE_CMD
     override val help = listOf(
         "To ignore a link posted to the channel:",
-        Utils.helpIndent("https://www.foo.bar %s"),
+        Utils.helpIndent("https://www.foo.bar %n"),
         "To check your ignore status:",
-        Utils.helpIndent("%s $command"),
+        Utils.helpIndent("%c $command"),
         "To toggle your ignore status:",
-        Utils.helpIndent("%s $command $me")
+        Utils.helpIndent("%c $command $me")
     )
     private val helpOp = listOf(
         "To ignore a link posted to the channel:",
-        Utils.helpIndent("https://www.foo.bar %s"),
+        Utils.helpIndent("https://www.foo.bar " + Utils.bold("%n"), false),
         "To add/remove nicks from the ignored list:",
-        Utils.helpIndent("%s $command <nick>|$me [<nick> ...]")
+        Utils.helpIndent("%c $command <nick> [<nick> ...]")
     )
 
     override val isOp = false
@@ -67,7 +67,7 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
 
     companion object {
         const val IGNORE_CMD = "ignore"
-        private val ignored = HashSet<String>()
+        private val ignored = TreeSet<String>()
 
         @JvmStatic
         fun isNotIgnored(nick: String): Boolean {
@@ -101,7 +101,7 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
     ): Boolean {
         return if (isOp) {
             for (h in helpOp) {
-                bot.send(sender, String.format(h, bot.nick), isPrivate)
+                bot.send(sender, Utils.helpFormat(h, bot.nick, isPrivate), isPrivate)
             }
             true
         } else {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
index 8c1969c..0f2f4f9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
@@ -41,7 +41,7 @@ class Info : AbstractCommand() {
     override val command = "info"
     override val help = listOf(
         "To view information about the bot:",
-        Utils.helpIndent("%s $command")
+        Utils.helpIndent("%c $command")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
index 75e4c1f..e7bd4d1 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
@@ -39,7 +39,7 @@ class Me : AbstractCommand() {
     override val command = "me"
     override val help = listOf(
         "To have the bot perform an action:",
-        Utils.helpIndent("%s $command <action>")
+        Utils.helpIndent("%c $command <action>")
     )
     override val isOp = true
     override val isPublic = false
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index d14f437..0d02f05 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -39,7 +39,7 @@ class Modules : AbstractCommand() {
     override val command = "modules"
     override val help = listOf(
         "To view a list of enabled modules:",
-        Utils.helpIndent("%s $command")
+        Utils.helpIndent("%c $command")
     )
     override val isOp = true
     override val isPublic = false
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
index a65ef5c..8f5814f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -39,7 +39,7 @@ class Msg : AbstractCommand() {
     override val command = "msg"
     override val help = listOf(
         "To have the bot send a private message to someone:",
-        Utils.helpIndent("%s $command <nick> <text>")
+        Utils.helpIndent("%c $command <nick> <text>")
     )
     override val isOp = true
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
index 1ab8256..95f3a55 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -39,7 +39,7 @@ class Nick : AbstractCommand() {
     override val command = "nick"
     override val help = listOf(
         "To change the bot's nickname:",
-        Utils.helpIndent("%s $command <nick>")
+        Utils.helpIndent("%c $command <nick>")
     )
     override val isOp = true
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
index c6c690a..7dfbe5e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -42,7 +42,7 @@ class Recap : AbstractCommand() {
     override val command = "recap"
     override val help = listOf(
         "To list the last 10 public channel messages:",
-        Utils.helpIndent("%s $command")
+        Utils.helpIndent("%c $command")
     )
     override val isOp = false
     override val isPublic = true
@@ -67,7 +67,7 @@ class Recap : AbstractCommand() {
         fun storeRecap(sender: String, message: String, isAction: Boolean) {
             recaps.add(
                 Utils.utcDateTime(LocalDateTime.now(Clock.systemUTC()))
-                    + " -> ${sender}: " + (if (isAction) " " else ": ") + message
+                    + " - $sender" + (if (isAction) " " else ": ") + message
             )
             if (recaps.size > 10) {
                 recaps.removeAt(0)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
index 1ddb5d7..19e9f7e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
@@ -39,7 +39,7 @@ class Say : AbstractCommand() {
     override val command = "say"
     override val help = listOf(
         "To have the bot say something on the channel:",
-        Utils.helpIndent("%s $command <text>")
+        Utils.helpIndent("%c $command <text>")
     )
     override val isOp = true
     override val isPublic = false
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index fad7358..9ee5add 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -41,7 +41,7 @@ class Users : AbstractCommand() {
     override val command = "users"
     override val help = listOf(
         "To list the users present on the channel:",
-        Utils.helpIndent("%s $command")
+        Utils.helpIndent("%c $command")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index db996fc..3e8d911 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -98,7 +98,11 @@ class Comment : AbstractCommand() {
         if (super.helpResponse(bot, command, sender, isOp, isPrivate)) {
             if (isOp) {
                 bot.send(sender, "To change a comment's author:", isPrivate)
-                bot.send(sender, Utils.helpIndent("/msg ${bot.nick} ${Constants.LINK_CMD}1.1:?<nick>"), isPrivate)
+                bot.send(
+                    sender,
+                    Utils.helpIndent("${Constants.LINK_CMD}1.1:?<nick>"),
+                    isPrivate
+                )
             }
             return true
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 8a90987..c5922b9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -51,7 +51,7 @@ class Posting : AbstractCommand() {
         Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
         "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
         "To edit a comment, see: ",
-        Utils.helpIndent("%s ${Constants.HELP_CMD} ${Comment.COMMAND}")
+        Utils.helpIndent("%c ${Constants.HELP_CMD} ${Comment.COMMAND}")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index c670a60..0edde92 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -45,7 +45,7 @@ class View : AbstractCommand() {
     override val command = VIEW_CMD
     override val help = listOf(
         "To list or search the current URL posts:",
-        Utils.helpIndent("%s $command [<start>] [<query>]")
+        Utils.helpIndent("%c $command [<start>] [<query>]")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index 46bbd27..ff626cb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -377,9 +377,10 @@ public class Tell extends AbstractCommand {
         } else {
             bot.send(sender, "To delete one or all delivered messages:", isPrivate);
             bot.send(sender,
-                     Utils.helpIndent(
-                             Utils.botCommand(bot.getNick(), isPrivate) + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|"
-                             + TELL_ALL_KEYWORD + '>'),
+                     Utils.helpIndent(Utils.helpFormat(
+                             "%c " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|" + TELL_ALL_KEYWORD + '>',
+                             bot.getNick(),
+                             isPrivate)),
                      isPrivate);
             bot.send(sender,
                      "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
index 12bee34..5b70957 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
@@ -33,6 +33,7 @@
 package net.thauvin.erik.mobibot.modules;
 
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Utils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
@@ -50,6 +51,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public abstract class AbstractModule {
     final List<String> commands = new ArrayList<>();
+    final List<String> help = new ArrayList<>();
     final Map<String, String> properties = new ConcurrentHashMap<>();
 
     /**
@@ -95,14 +97,17 @@ public abstract class AbstractModule {
     }
 
     /**
-     * Responds with the module's Constants.
-     *  @param bot       The bot's instance.
+     * Responds with the module's help.
+     *
+     * @param bot       The bot's instance.
      * @param sender    The sender.
      * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
      */
-    public abstract void helpResponse(final Mobibot bot,
-                                      final String sender,
-                                      final boolean isPrivate);
+    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+        for (final String h : help) {
+            bot.send(sender, Utils.helpFormat(h, bot.getNick(), isPrivateMsgEnabled() && isPrivate), isPrivate);
+        }
+    }
 
     /**
      * Returns <code>true</code> if the module is enabled.
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
index f9e1e2f..400ecdb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
@@ -56,7 +56,11 @@ public class Calc extends AbstractModule {
      */
     public Calc() {
         super();
+
         commands.add(CALC_CMD);
+
+        help.add("To solve a mathematical calculation:");
+        help.add(Utils.helpIndent("%c " + CALC_CMD + " <calculation>"));
     }
 
     /**
@@ -93,13 +97,4 @@ public class Calc extends AbstractModule {
             helpResponse(bot, sender, isPrivate);
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        bot.send(sender, "To solve a mathematical calculation:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CALC_CMD + " <calculation>"), isPrivate);
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
index 1fd2c7c..03a7737 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
@@ -84,6 +84,7 @@ public final class CurrencyConverter extends ThreadedModule {
      */
     public CurrencyConverter() {
         super();
+
         commands.add(CURRENCY_CMD);
     }
 
@@ -239,11 +240,15 @@ public final class CurrencyConverter extends ThreadedModule {
             bot.send(sender, EMPTY_RATE_TABLE, isPrivate);
         } else {
             bot.send(sender, "To convert from one currency to another:", isPrivate);
-            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD + " 100 USD to EUR"), isPrivate);
+            bot.send(sender,
+                     Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + " 100 USD to EUR",
+                                                       bot.getNick(),
+                                                       isPrivate)), isPrivate);
             bot.send(sender, "For a listing of current rates:", isPrivate);
             bot.send(sender,
-                     Utils.helpIndent(bot.getNick() + ": " + CURRENCY_CMD) + ' ' + CURRENCY_RATES_KEYWORD,
-                     isPrivate);
+                     Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + ' ' + CURRENCY_RATES_KEYWORD,
+                                                       bot.getNick(),
+                                                       isPrivate)), isPrivate);
             bot.send(sender, "The supported currencies are: ", isPrivate);
             bot.sendCommandsList(sender, new ArrayList<>(EXCHANGE_RATES.keySet()), 11, isPrivate, false);
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
index ec1d57c..26ad7ef 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
@@ -55,7 +55,11 @@ public final class Dice extends AbstractModule {
      */
     public Dice() {
         super();
+
         commands.add(DICE_CMD);
+
+        help.add("To roll the dice:");
+        help.add(Utils.helpIndent("%c " + DICE_CMD));
     }
 
     /**
@@ -92,13 +96,4 @@ public final class Dice extends AbstractModule {
             bot.action("tied.");
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        bot.send(sender, "To roll the dice:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + DICE_CMD), isPrivate);
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
index e8b6597..0f64d0c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
@@ -72,7 +72,12 @@ public final class GoogleSearch extends ThreadedModule {
      */
     public GoogleSearch() {
         super();
+
         commands.add(GOOGLE_CMD);
+
+        help.add("To search Google:");
+        help.add(Utils.helpIndent("%c " + GOOGLE_CMD + " <query>"));
+
         properties.put(GOOGLE_API_KEY_PROP, "");
         properties.put(GOOGLE_CSE_KEY_PROP, "");
     }
@@ -137,19 +142,6 @@ public final class GoogleSearch extends ThreadedModule {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        if (isEnabled()) {
-            bot.send(sender, "To search Google:", isPrivate);
-            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + GOOGLE_CMD + " <query>"), isPrivate);
-        } else {
-            bot.send(sender, "The Google search module is disabled.", isPrivate);
-        }
-    }
-
     /**
      * Searches Google.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
index 5f30ccd..a8a6a42 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
@@ -63,7 +63,11 @@ public final class Joke extends ThreadedModule {
      */
     public Joke() {
         super();
+
         commands.add(JOKE_CMD);
+
+        help.add("To retrieve a random joke:");
+        help.add(Utils.helpIndent("%c " + JOKE_CMD));
     }
 
     /**
@@ -120,13 +124,4 @@ public final class Joke extends ThreadedModule {
             bot.send(sender, e.getMessage(), isPrivate);
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        bot.send(sender, "To retrieve a random joke:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + JOKE_CMD), isPrivate);
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
index c1292f6..20ab522 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
@@ -62,7 +62,11 @@ public final class Lookup extends AbstractModule {
      */
     public Lookup() {
         super();
+
         commands.add(LOOKUP_CMD);
+
+        help.add("To perform a DNS lookup query:");
+        help.add(Utils.helpIndent("%c " + LOOKUP_CMD + " <ip address or hostname>"));
     }
 
     /**
@@ -190,13 +194,4 @@ public final class Lookup extends AbstractModule {
             helpResponse(bot, sender, true);
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        bot.send(sender, "To perform a DNS lookup query:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + LOOKUP_CMD + " <ip address or hostname>"), isPrivate);
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
index 6123898..ae1f518 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
@@ -74,7 +74,11 @@ public class Ping extends AbstractModule {
      */
     public Ping() {
         super();
+
         commands.add(PING_CMD);
+
+        help.add("To ping the bot:");
+        help.add(Utils.helpIndent("%c " + PING_CMD));
     }
 
     /**
@@ -89,13 +93,4 @@ public class Ping extends AbstractModule {
         final SecureRandom r = new SecureRandom();
         bot.action(PINGS.get(r.nextInt(PINGS.size())));
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        bot.send(sender, "To ping the bot:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + PING_CMD), isPrivate);
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 061f08e..7374fa8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -33,9 +33,9 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.green
-import net.thauvin.erik.mobibot.Utils.helpIndent
 import net.thauvin.erik.mobibot.Utils.red
 import kotlin.random.Random
 
@@ -50,6 +50,16 @@ class RockPaperScissors : AbstractModule() {
             add(Hands.PAPER.name.toLowerCase())
             add(Hands.SCISSORS.name.toLowerCase())
         }
+
+        with(help) {
+            add("To play Rock Paper Scissors:")
+            add(
+                Utils.helpIndent(
+                    "%c ${Hands.ROCK.name.toLowerCase()} | ${Hands.PAPER.name.toLowerCase()}"
+                        + " | ${Hands.SCISSORS.name.toLowerCase()}"
+                )
+            )
+        }
     }
 
     enum class Hands(val action: String) {
@@ -105,16 +115,4 @@ class RockPaperScissors : AbstractModule() {
             }
         }
     }
-
-    override fun helpResponse(bot: Mobibot, sender: String, isPrivate: Boolean) {
-        bot.send(sender, "To play Rock Paper Scissors:", isPrivate)
-        bot.send(
-            sender,
-            helpIndent(
-                "${bot.nick}: ${Hands.ROCK.name.toLowerCase()} | ${Hands.PAPER.name.toLowerCase()}"
-                    + " | ${Hands.SCISSORS.name.toLowerCase()}"
-            ),
-            isPrivate
-        )
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
index 925c719..210d907 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
@@ -79,6 +79,10 @@ public final class StockQuote extends ThreadedModule {
     public StockQuote() {
         super();
         commands.add(STOCK_CMD);
+
+        help.add("To retrieve a stock quote:");
+        help.add(Utils.helpIndent("%c " + STOCK_CMD + " <symbol|keywords>"));
+
         properties.put(ALPHAVANTAGE_API_KEY_PROP, "");
     }
 
@@ -200,15 +204,6 @@ public final class StockQuote extends ThreadedModule {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        bot.send(sender, "To retrieve a stock quote:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + STOCK_CMD + " <symbol|keywords>"), isPrivate);
-    }
-
     /**
      * Returns the specified stock quote from Alpha Avantage.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index 2d0c997..8991bc3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -62,7 +62,12 @@ public final class Twitter extends ThreadedModule {
      */
     public Twitter() {
         super();
+
         commands.add(TWITTER_CMD);
+
+        help.add("To post to Twitter:");
+        help.add(Utils.helpIndent("%c " + TWITTER_CMD + " <message>"));
+
         properties.put(CONSUMER_SECRET_PROP, "");
         properties.put(CONSUMER_KEY_PROP, "");
         properties.put(TOKEN_PROP, "");
@@ -110,19 +115,6 @@ public final class Twitter extends ThreadedModule {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        if (isEnabled()) {
-            bot.send(sender, "To post to Twitter:", isPrivate);
-            bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TWITTER_CMD + " <message>"), isPrivate);
-        } else {
-            bot.send(sender, "The Twitter posting facility is " + Utils.bold("disabled") + '.', isPrivate);
-        }
-    }
-
     /**
      * Posts on Twitter.
      *
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index a7b294b..bf089fb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -60,7 +60,11 @@ public final class War extends AbstractModule {
      */
     public War() {
         super();
+
         commands.add(WAR_CMD);
+
+        help.add("To play war:");
+        help.add(Utils.helpIndent("%c " + WAR_CMD));
     }
 
     /**
@@ -97,13 +101,4 @@ public final class War extends AbstractModule {
             bot.action("wins.");
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        bot.send(sender, "To play war:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WAR_CMD), isPrivate);
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
index 1463e36..4d58090 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
@@ -75,7 +75,15 @@ public class Weather2 extends ThreadedModule {
      */
     public Weather2() {
         super();
+
         commands.add(WEATHER_CMD);
+
+        help.add("To display weather information:");
+        help.add(Utils.helpIndent("%c " + WEATHER_CMD + " <city> [, <country code>]"));
+        help.add("For example:");
+        help.add(Utils.helpIndent("%c " + WEATHER_CMD + " paris, fr"));
+        help.add("The default ISO 3166 country code is " + bold("US") + ". Zip codes supported in most countries.");
+
         properties.put(OWM_API_KEY_PROP, "");
     }
 
@@ -206,22 +214,6 @@ public class Weather2 extends ThreadedModule {
         return Math.round(w) + " mph, " + Math.round(kmh) + " km/h";
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        bot.send(sender, "To display weather information:", isPrivate);
-        bot.send(sender,
-                 Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " <city> [, <country code>]"),
-                 isPrivate);
-        bot.send(sender, "For example:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + WEATHER_CMD + " paris, fr"), isPrivate);
-        bot.send(sender,
-                 "The default ISO 3166 country code is " + bold("US")
-                 + ". Zip codes are supported in most countries.", isPrivate);
-    }
-
     /**
      * Fetches the weather data from a specific city.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
index 74dbc4a..5435555 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
@@ -63,7 +63,6 @@ public final class WorldTime extends AbstractModule {
     // Supported countries
     private static final Map<String, String> COUNTRIES_MAP;
 
-
     /**
      * The time command.
      */
@@ -160,9 +159,16 @@ public final class WorldTime extends AbstractModule {
      */
     public WorldTime() {
         super();
+
+        help.add("To display a country's current date/time:");
+        help.add(Utils.helpIndent("%c " + TIME_CMD) + " [<country code>]");
+        help.add("For a listing of the supported countries:");
+        help.add(Utils.helpIndent("%c " + TIME_CMD));
+
         commands.add(TIME_CMD);
     }
 
+
     /**
      * Returns the current Internet (beat) Time.
      *
@@ -234,18 +240,6 @@ public final class WorldTime extends AbstractModule {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
-        bot.send(sender, "To display a country's current date/time:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD) + " [<country code>]", isPrivate);
-
-        bot.send(sender, "For a listing of the supported countries:", isPrivate);
-        bot.send(sender, Utils.helpIndent(bot.getNick() + ": " + TIME_CMD), isPrivate);
-    }
-
     /**
      * {@inheritDoc}
      */

From 2067a228aa916de2f058d085b4a793f752efebbc Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 31 Mar 2020 22:35:34 -0700
Subject: [PATCH 030/262] Fixed twitter autopost initialization (was too
 early.)

---
 .../java/net/thauvin/erik/mobibot/Mobibot.java | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index e06b661..e050236 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -130,8 +130,6 @@ public class Mobibot extends PircBot {
     private static final String DEFAULT_SERVER = "irc.freenode.net";
     // Maximum number of times the bot will try to reconnect, if disconnected
     private static final int MAX_RECONNECT = 10;
-    // Number of milliseconds to delay between consecutive messages
-    private static final long MESSAGE_DELAY = 1000L;
     // Logger
     private static final Logger logger = LogManager.getLogger(Mobibot.class);
     // Ignore command
@@ -226,7 +224,7 @@ public class Mobibot extends PircBot {
         setAutoNickChange(true);
         setLogin(p.getProperty("login", getName()));
         setVersion(p.getProperty("weblog", ""));
-        setMessageDelay(MESSAGE_DELAY);
+        // setMessageDelay(1000);
         setIdentity(p.getProperty("ident", ""), p.getProperty("ident-nick", ""), p.getProperty("ident-msg", ""));
 
         // Set the URLs
@@ -278,12 +276,10 @@ public class Mobibot extends PircBot {
         addModule(new RockPaperScissors());
         addModule(new StockQuote());
 
+        // Twitter
         twitterModule = new Twitter();
         addModule(twitterModule);
-        twitterHandle = p.getProperty(Constants.TWITTER_HANDLE_PROP, "");
-        isTwitterAutoPost =
-                Boolean.parseBoolean(p.getProperty(Constants.TWITTER_AUTOPOST_PROP, "false"))
-                && twitterModule.isEnabled();
+
         addModule(new War());
         addModule(new Weather2());
         addModule(new WorldTime());
@@ -295,6 +291,12 @@ public class Mobibot extends PircBot {
             }
         });
 
+        // Twitter extra properties
+        twitterHandle = p.getProperty(Constants.TWITTER_HANDLE_PROP, "");
+        isTwitterAutoPost =
+                Boolean.parseBoolean(p.getProperty(Constants.TWITTER_AUTOPOST_PROP, "false"))
+                && twitterModule.isEnabled();
+
         // Save the entries
         UrlMgr.saveEntries(this, true);
     }
@@ -492,7 +494,7 @@ public class Mobibot extends PircBot {
         if (isNotBlank(feedUrl)) {
             new Thread(new FeedReader(this, sender, feedUrl)).start();
         } else {
-            send(sender, "There is no weblog setup for this channel.", false);
+            send(sender, "There is no feed setup for this channel.", false);
         }
     }
 

From df386802262310dcdb62d781b7996693a29cf564 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 31 Mar 2020 22:36:08 -0700
Subject: [PATCH 031/262] Tags are now set in lists.

---
 .../erik/mobibot/commands/links/UrlMgr.kt     | 24 +++---
 .../erik/mobibot/entries/EntryLink.java       | 80 +++++++++----------
 .../erik/mobibot/entries/EntryLinkTest.java   |  2 +-
 3 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
index 1daf17e..de2db08 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -45,7 +45,8 @@ import org.jsoup.Jsoup
 import java.io.IOException
 
 class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
-    private val tagsKeywords = ArrayList<String>()
+    private val keywords = ArrayList<String>()
+    private val tags = ArrayList<String>()
     override val command = Constants.LINK_CMD
     override val help = emptyList<String>()
     override val isOp = false
@@ -53,19 +54,19 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
     override val isVisible = false
 
     init {
-        tagsKeywords.addAll(keywords.split(", +?| +"))
-        Companion.defaultTags = defaultTags
+        this.keywords.addAll(keywords.split(TAG_MATCH.toRegex()))
+        tags.addAll(defaultTags.split(TAG_MATCH.toRegex()))
     }
 
     companion object {
         const val LINK_MATCH = "^[hH][tT][tT][pP](|[sS])://.*"
+        const val TAG_MATCH = ", *| +"
 
         // Entries array
         private val entries = ArrayList<EntryLink>(0)
 
         // History/backlogs array
         private val history = ArrayList<String>(0)
-        private lateinit var defaultTags: String
 
         @JvmStatic
         val entriesCount
@@ -130,19 +131,18 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
             val link = cmds[0].trim()
             if (!isDupEntry(bot, sender, link, isPrivate)) {
                 val isBackup = saveDayBackup(bot)
-                val tags: StringBuilder = StringBuilder(defaultTags)
                 var title = Constants.NO_TITLE
                 if (cmds.size == 2) {
                     val data = cmds[1].trim().split("${Tags.COMMAND}:", limit = 2)
                     title = data[0].trim()
                     if (data.size > 1) {
-                        tags.append(' ').append(data[1].trim())
+                        tags.addAll(data[1].split(TAG_MATCH.toRegex()))
                     }
                 }
-                tags.append(matchTagKeywords(title))
                 title = fetchTitle(link, title)
+                tags.addAll(matchTagKeywords(title))
 
-                entries.add(EntryLink(link, title, sender, login, bot.channel, tags.toString()))
+                entries.add(EntryLink(link, title, sender, login, bot.channel, tags))
                 val index: Int = entries.size - 1
                 val entry: EntryLink = entries[index]
                 bot.send(EntriesUtils.buildLink(index, entry))
@@ -210,17 +210,17 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
         return false
     }
 
-    private fun matchTagKeywords(title: String): String {
+    private fun matchTagKeywords(title: String): List<String> {
         val matches = ArrayList<String>()
-        if (tagsKeywords.isNotEmpty()) {
-            for (match in tagsKeywords) {
+        if (keywords.isNotEmpty()) {
+            for (match in keywords) {
                 val m = match.trim()
                 if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
                     matches.add(m)
                 }
             }
         }
-        return matches.joinToString(" ")
+        return matches
     }
 
     private fun saveDayBackup(bot: Mobibot): Boolean {
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
index af6986a..26f098a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
@@ -35,9 +35,11 @@ package net.thauvin.erik.mobibot.entries;
 import com.rometools.rome.feed.synd.SyndCategory;
 import com.rometools.rome.feed.synd.SyndCategoryImpl;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.thauvin.erik.mobibot.commands.links.UrlMgr;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -93,7 +95,7 @@ public class EntryLink implements Serializable {
                      final String nick,
                      final String login,
                      final String channel,
-                     final String tags) {
+                     final List<String> tags) {
         this.link = link;
         this.title = title;
         this.nick = nick;
@@ -124,8 +126,7 @@ public class EntryLink implements Serializable {
         this.nick = nick;
         this.channel = channel;
         this.date = new Date(date.getTime());
-
-        setTags(tags);
+        this.tags.addAll(tags);
     }
 
     /**
@@ -345,53 +346,46 @@ public class EntryLink implements Serializable {
      *
      * @param tags The space-delimited tags.
      */
-    @SuppressFBWarnings("STT_STRING_PARSING_A_FIELD")
-    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     public final void setTags(final String tags) {
-        if (tags != null) {
-            final String[] parts = tags.replace(", ", " ").replace(',', ' ').split(" ");
-
-            SyndCategoryImpl tag;
-            String part;
-            char mod;
-
-            for (final String rawPart : parts) {
-                part = rawPart.trim();
-
-                if (part.length() >= 2) {
-                    tag = new SyndCategoryImpl();
-                    tag.setName(StringUtils.lowerCase(part.substring(1)));
-
-                    mod = part.charAt(0);
-
-                    if (mod == '-') {
-                        // Don't remove the channel tag, if any
-                        if (!channel.substring(1).equals(tag.getName())) {
-                            this.tags.remove(tag);
-                        }
-                    } else if (mod == '+') {
-                        if (!this.tags.contains(tag)) {
-                            this.tags.add(tag);
-                        }
-                    } else {
-                        tag.setName(StringUtils.lowerCase(part.trim()));
-
-                        if (!this.tags.contains(tag)) {
-                            this.tags.add(tag);
-                        }
-                    }
-                }
-            }
-        }
+        setTags(Arrays.asList(tags.split(UrlMgr.TAG_MATCH)));
     }
 
     /**
      * Sets the tags.
      *
-     * @param tags The tags.
+     * @param tags The tags list.
      */
-    final void setTags(final List<SyndCategory> tags) {
-        this.tags.addAll(tags);
+    @SuppressFBWarnings("STT_STRING_PARSING_A_FIELD")
+    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
+    public final void setTags(final List<String> tags) {
+        if (!tags.isEmpty()) {
+            SyndCategoryImpl category;
+
+            for (final String tag : tags) {
+                if (!tag.isBlank()) {
+                    final String t = StringUtils.lowerCase(tag);
+                    final char mod = t.charAt(0);
+                    if (mod == '-') {
+                        // Don't remove the channel tag
+                        if (!channel.substring(1).equals(t.substring(1))) {
+                            category = new SyndCategoryImpl();
+                            category.setName(t.substring(1));
+                            this.tags.remove(category);
+                        }
+                    } else {
+                        category = new SyndCategoryImpl();
+                        if (mod == '+') {
+                            category.setName(t.substring(1));
+                        } else {
+                            category.setName(t);
+                        }
+                        if (!this.tags.contains(category)) {
+                            this.tags.add(category);
+                        }
+                    }
+                }
+            }
+        }
     }
 
     /**
diff --git a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java
index cc4ad92..9c32598 100644
--- a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java
@@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class EntryLinkTest {
     private final EntryLink entryLink = new EntryLink("https://www.mobitopia.org/", "Mobitopia", "Skynx",
-        "JimH", "#mobitopia", "tag1, tag2,tag3 TAG4   tag5");
+        "JimH", "#mobitopia", List.of("tag1", "tag2", "tag3", "TAG4", "Tag5"));
 
 
     @Test

From e3cbc4e80832b528d300d3640b53ffd825d30431 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 31 Mar 2020 22:36:18 -0700
Subject: [PATCH 032/262] Cleanup.

---
 src/main/java/net/thauvin/erik/mobibot/FeedReader.java    | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
index 9188758..d140105 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
@@ -83,11 +83,11 @@ class FeedReader implements Runnable {
             final SyndFeedInput input = new SyndFeedInput();
             final SyndFeed feed = input.build(new XmlReader(new URL(url)));
 
-            SyndEntry item;
             final List<SyndEntry> items = feed.getEntries();
             if (items.isEmpty()) {
                 bot.send(sender, "There is currently nothing to view. Why don't you post something?", false);
             } else {
+                SyndEntry item;
                 for (int i = 0; (i < items.size()) && (i < MAX_ITEMS); i++) {
                     item = items.get(i);
                     bot.send(sender, item.getTitle(), false);
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index 3138b70..ffc42a0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -34,6 +34,7 @@ package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.links.UrlMgr
 import java.util.*
 
 class Ignore(defaultIgnore: String) : AbstractCommand() {
@@ -41,7 +42,7 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
 
     init {
         if (defaultIgnore.isNotBlank()) {
-            ignored.addAll(defaultIgnore.split(", *| +".toRegex()))
+            ignored.addAll(defaultIgnore.split(UrlMgr.LINK_MATCH.toRegex()))
         }
     }
 

From 2ffa5f29b99c55c9ffb98859c2096c41e16d191c Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 31 Mar 2020 22:56:27 -0700
Subject: [PATCH 033/262] Fix for Java 9 compatibility (isBlank)

---
 .../erik/mobibot/entries/EntryLink.java        | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
index 26f098a..48c5894 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
@@ -362,7 +362,7 @@ public class EntryLink implements Serializable {
             SyndCategoryImpl category;
 
             for (final String tag : tags) {
-                if (!tag.isBlank()) {
+                if (StringUtils.isNoneBlank(tag)) {
                     final String t = StringUtils.lowerCase(tag);
                     final char mod = t.charAt(0);
                     if (mod == '-') {
@@ -403,10 +403,16 @@ public class EntryLink implements Serializable {
      * @return A string representation of the object.
      */
     @Override
-    public final String toString() {
-
-        return super.toString() + "[ channel -> '" + channel + '\'' + ", comments -> " + comments + ", date -> " + date
-               + ", link -> '" + link + '\'' + ", login -> '" + login + '\'' + ", nick -> '" + nick + '\''
-               + ", tags -> " + tags + ", title -> '" + title + '\'' + " ]";
+    public String toString() {
+        return "EntryLink{" +
+               "comments=" + comments +
+               ", tags=" + tags +
+               ", channel='" + channel + '\'' +
+               ", date=" + date +
+               ", link='" + link + '\'' +
+               ", login='" + login + '\'' +
+               ", nick='" + nick + '\'' +
+               ", title='" + title + '\'' +
+               '}';
     }
 }

From bde70343b78a6b60aea02ee8002cc9b65dd34c29 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 1 Apr 2020 11:12:43 -0700
Subject: [PATCH 034/262] Added toString()

---
 .../mobibot/commands/tell/TellMessage.java    | 14 +++++++++
 .../commands/tell/TellMessagesMgr.java        |  2 --
 .../erik/mobibot/entries/EntryComment.java    | 31 ++++++++++++-------
 .../erik/mobibot/entries/EntryLink.java       | 20 ++++++------
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
index 89dafab..40d71f7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
@@ -178,4 +178,18 @@ public class TellMessage implements Serializable {
         received = LocalDateTime.now(Clock.systemUTC());
         isReceived = true;
     }
+
+    @Override
+    public String toString() {
+        return "TellMessage{"
+               + "id='" + id + '\''
+               + ", isNotified=" + isNotified
+               + ", isReceived=" + isReceived
+               + ", message='" + message + '\''
+               + ", queued=" + queued
+               + ", received=" + received
+               + ", recipient='" + recipient + '\''
+               + ", sender='" + sender + '\''
+               + '}';
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
index fd98c72..e4050f7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
@@ -89,7 +89,6 @@ final class TellMessagesMgr {
     @SuppressWarnings("unchecked")
     public static List<TellMessage> load(final String file, final Logger logger) {
         try {
-
             try (final ObjectInput input = new ObjectInputStream(
                 new BufferedInputStream(Files.newInputStream(Paths.get(file))))) {
                 if (logger.isDebugEnabled()) {
@@ -116,7 +115,6 @@ final class TellMessagesMgr {
      */
     public static void save(final String file, final List<TellMessage> messages, final Logger logger) {
         try {
-
             try (final ObjectOutput output = new ObjectOutputStream(
                 new BufferedOutputStream(Files.newOutputStream(Paths.get(file))))) {
                 if (logger.isDebugEnabled()) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.java
index 1661350..5c51f1a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.java
@@ -42,7 +42,7 @@ import java.time.LocalDateTime;
  * @created Jan 31, 2004
  * @since 1.0
  */
-@SuppressWarnings({"PMD.DataClass"})
+@SuppressWarnings({ "PMD.DataClass" })
 public class EntryComment implements Serializable {
     // Serial version UID
     static final long serialVersionUID = 1L;
@@ -81,16 +81,6 @@ public class EntryComment implements Serializable {
         return comment;
     }
 
-    /**
-     * Sets the comment.
-     *
-     * @param comment The actual comment.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    public final void setComment(final String comment) {
-        this.comment = comment;
-    }
-
     /**
      * Returns the comment's creation date.
      *
@@ -110,6 +100,16 @@ public class EntryComment implements Serializable {
         return nick;
     }
 
+    /**
+     * Sets the comment.
+     *
+     * @param comment The actual comment.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public final void setComment(final String comment) {
+        this.comment = comment;
+    }
+
     /**
      * Sets the nickname of the author of the comment.
      *
@@ -118,4 +118,13 @@ public class EntryComment implements Serializable {
     public final void setNick(final String nick) {
         this.nick = nick;
     }
+
+    @Override
+    public String toString() {
+        return "EntryComment{"
+               + "comment='" + comment + '\''
+               + ", date=" + date
+               + ", nick='" + nick + '\''
+               + '}';
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
index 48c5894..aaa09cf 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
@@ -404,15 +404,15 @@ public class EntryLink implements Serializable {
      */
     @Override
     public String toString() {
-        return "EntryLink{" +
-               "comments=" + comments +
-               ", tags=" + tags +
-               ", channel='" + channel + '\'' +
-               ", date=" + date +
-               ", link='" + link + '\'' +
-               ", login='" + login + '\'' +
-               ", nick='" + nick + '\'' +
-               ", title='" + title + '\'' +
-               '}';
+        return "EntryLink{"
+               + "channel='" + channel + '\''
+               + ", comments=" + comments
+               + ", date=" + date
+               + ", link='" + link + '\''
+               + ", login='" + login + '\''
+               + ", nick='" + nick + '\''
+               + ", tags=" + tags
+               + ", title='" + title + '\''
+               + '}';
     }
 }

From 404863669630f2abeb10e21d2b7f29f78e30c684 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 1 Apr 2020 17:38:22 -0700
Subject: [PATCH 035/262] Converted Message to Kotlin.

---
 .../net/thauvin/erik/mobibot/Mobibot.java     |   2 +-
 .../thauvin/erik/mobibot/modules/Joke.java    |   2 +-
 .../thauvin/erik/mobibot/modules/Twitter.java |   2 +-
 .../erik/mobibot/modules/WorldTime.java       |   6 +-
 .../{ErrorMessage.java => ErrorMessage.kt}    |  37 ++--
 .../net/thauvin/erik/mobibot/msg/Message.java | 193 ------------------
 .../net/thauvin/erik/mobibot/msg/Message.kt   | 105 ++++++++++
 .../{NoticeMessage.java => NoticeMessage.kt}  |  31 ++-
 ...{PrivateMessage.java => PrivateMessage.kt} |  34 +--
 .../{PublicMessage.java => PublicMessage.kt}  |  32 +--
 .../modules/CurrencyConverterTest.java        |   6 +-
 .../mobibot/modules/GoogleSearchTest.java     |  10 +-
 .../erik/mobibot/modules/JokeTest.java        |   4 +-
 .../erik/mobibot/modules/StockQuoteTest.java  |   2 +-
 .../erik/mobibot/modules/TwitterTest.java     |   2 +-
 .../erik/mobibot/modules/Weather2Test.java    |   8 +-
 .../erik/mobibot/modules/WordTimeTest.java    |   4 +-
 17 files changed, 196 insertions(+), 284 deletions(-)
 rename src/main/java/net/thauvin/erik/mobibot/msg/{ErrorMessage.java => ErrorMessage.kt} (71%)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/msg/Message.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
 rename src/main/java/net/thauvin/erik/mobibot/msg/{NoticeMessage.java => NoticeMessage.kt} (73%)
 rename src/main/java/net/thauvin/erik/mobibot/msg/{PrivateMessage.java => PrivateMessage.kt} (75%)
 rename src/main/java/net/thauvin/erik/mobibot/msg/{PublicMessage.java => PublicMessage.kt} (75%)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index e050236..ffded5d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -970,7 +970,7 @@ public class Mobibot extends PircBot {
      * @param message The message.
      */
     public final void send(final String who, final Message message) {
-        send(message.isNotice() ? who : getChannel(), message.getMessage(), message.getColor(), message.isPrivate());
+        send(message.isNotice() ? who : getChannel(), message.getText(), message.getColor(), message.isPrivate());
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
index a8a6a42..cc24afa 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
@@ -118,7 +118,7 @@ public final class Joke extends ThreadedModule {
     @Override
     void run(final Mobibot bot, final String sender, final String cmd, final String arg, final boolean isPrivate) {
         try {
-            bot.send(Utils.cyan(randomJoke().getMessage()));
+            bot.send(Utils.cyan(randomJoke().getText()));
         } catch (ModuleException e) {
             bot.getLogger().warn(e.getDebugMessage(), e);
             bot.send(sender, e.getMessage(), isPrivate);
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index 8991bc3..0ef6f15 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -142,7 +142,7 @@ public final class Twitter extends ThreadedModule {
     void run(final Mobibot bot, final String sender, final String cmd, final String message, final boolean isPrivate) {
         try {
             bot.send(sender,
-                     post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getMessage(),
+                     post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getText(),
                      isPrivate);
         } catch (ModuleException e) {
             bot.getLogger().warn(e.getDebugMessage(), e);
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
index 5435555..91fb27c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
@@ -229,12 +229,12 @@ public final class WorldTime extends AbstractModule {
         } else {
             final Message msg = worldTime(args);
             if (isPrivate) {
-                bot.send(sender, msg.getMessage(), true);
+                bot.send(sender, msg.getText(), true);
             } else {
                 if (msg.isError()) {
-                    bot.send(sender, msg.getMessage(), false);
+                    bot.send(sender, msg.getText(), false);
                 } else {
-                    bot.send(msg.getMessage());
+                    bot.send(msg.getText());
                 }
             }
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.java b/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
similarity index 71%
rename from src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.java
rename to src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
index dea79a6..6c00add 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
@@ -29,41 +29,38 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package net.thauvin.erik.mobibot.msg;
+package net.thauvin.erik.mobibot.msg
 
 /**
- * The <code>ErrorMessage</code> class.
+ * The `ErrorMessage` class.
  *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
+ * @author [Erik C. Thauvin](https://erik.thauvin.net/)
  * @created 2019-04-07
  * @since 1.0
  */
-public class ErrorMessage extends Message {
+class ErrorMessage : Message {
     /**
      * Creates a new error message.
      *
-     * @param message The error message.
+     * @param text The error message.
      */
-    public ErrorMessage(final String message) {
-        super();
-        this.setMessage(message);
-        this.setError(true);
-        this.setNotice(true);
+    constructor(text: String) : super() {
+        this.text = text
+        isError = true
+        isNotice = true
     }
 
     /**
      * Creates a new error message.
      *
-     * @param message The message.
-     * @param color   The message color.
+     * @param text The message.
+     * @param color The message color.
      */
-    @SuppressWarnings("unused")
-    public ErrorMessage(final String message, final String color) {
-        super();
-        this.setMessage(message);
-        this.setError(true);
-        this.setNotice(true);
-        this.setColor(color);
+    @Suppress("unused")
+    constructor(text: String, color: String) : super() {
+        this.text = text
+        isError = true
+        isNotice = true
+        this.color = color
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/Message.java b/src/main/java/net/thauvin/erik/mobibot/msg/Message.java
deleted file mode 100644
index cc70c2a..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/msg/Message.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Message.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.msg;
-
-import org.jibble.pircbot.Colors;
-
-/**
- * The <code>Message</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-07
- * @since 1.0
- */
-public class Message {
-    private String color = Colors.NORMAL;
-    private boolean isError;
-    private boolean isNotice;
-    private boolean isPrivate;
-    private String msg = "";
-
-    /**
-     * Creates a new message.
-     */
-    public Message() {
-        // This constructor is intentionally empty
-    }
-
-    /**
-     * Creates a new message.
-     *
-     * @param message   The message.
-     * @param isNotice  The notice flag.
-     * @param isError   The error flag.
-     * @param isPrivate The Private message
-     */
-    @SuppressWarnings("unused")
-    public Message(final String message, final boolean isNotice, final boolean isError, final boolean isPrivate) {
-        msg = message;
-        this.isNotice = isNotice;
-        this.isError = isError;
-        this.isPrivate = isPrivate;
-    }
-
-
-    /**
-     * Creates a new message.
-     *
-     * @param message   The message.
-     * @param isNotice  The notice flag.
-     * @param isError   The error flag.
-     * @param isPrivate The Private message
-     * @param color     The color.
-     */
-    @SuppressWarnings("unused")
-    public Message(final String message,
-                   final boolean isNotice,
-                   final boolean isError,
-                   final boolean isPrivate,
-                   final String color) {
-        msg = message;
-        this.isNotice = isNotice;
-        this.isError = isError;
-        this.isPrivate = isPrivate;
-        this.color = color;
-    }
-
-    /**
-     * Returns the message color.
-     *
-     * @return The color.
-     */
-    public String getColor() {
-        return color;
-    }
-
-    /**
-     * Returns the message.
-     *
-     * @return The message.
-     */
-    public String getMessage() {
-        return msg;
-    }
-
-    /**
-     * Returns the message error flag.
-     *
-     * @return The error flag.
-     */
-    public boolean isError() {
-        return isError;
-    }
-
-    /**
-     * Returns the message notice flag.
-     *
-     * @return The notice flag.
-     */
-    public boolean isNotice() {
-        return isNotice;
-    }
-
-    /**
-     * Returns the message private flag.
-     *
-     * @return The private flag.
-     */
-    public boolean isPrivate() {
-        return isPrivate;
-    }
-
-    /**
-     * Set the color.
-     *
-     * @param color The new color.
-     */
-    public void setColor(final String color) {
-        this.color = color;
-    }
-
-    /**
-     * Sets the message error flag.
-     *
-     * @param error The error flag.
-     */
-    public void setError(final boolean error) {
-        isError = error;
-    }
-
-    /**
-     * Sets the message.
-     *
-     * @param message The new message.
-     */
-    public void setMessage(final String message) {
-        msg = message;
-    }
-
-    /**
-     * Sets the message notice flag.
-     *
-     * @param isNotice The notice flag.
-     */
-    public void setNotice(final boolean isNotice) {
-        this.isNotice = isNotice;
-    }
-
-    /**
-     * Sets the message private flag.
-     *
-     * @param isPrivate The private flag.
-     */
-    @SuppressWarnings("unused")
-    public void setPrivate(final boolean isPrivate) {
-        this.isPrivate = isPrivate;
-    }
-
-    @Override
-    public String toString() {
-        return "Message{" + "color='" + color + '\'' + ", isError=" + isError + ", isNotice=" + isNotice
-               + ", isPrivate=" + isPrivate + ", msg='" + msg + '\'' + '}';
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
new file mode 100644
index 0000000..d95e792
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
@@ -0,0 +1,105 @@
+/*
+ * Message.java
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.msg
+
+import org.jibble.pircbot.Colors
+
+/**
+ * The `Message` class.
+ *
+ * @author [Erik C. Thauvin](https://erik.thauvin.net/)
+ * @created 2019-04-07
+ * @since 1.0
+ */
+open class Message {
+    /** Color */
+    var color = Colors.NORMAL
+
+    /** Error */
+    var isError = false
+
+    /** Notice */
+    var isNotice = false
+
+    /** Private */
+    var isPrivate = false
+
+    /** Message text*/
+    var text = ""
+
+    /** Creates a new message. */
+    constructor() {
+        // This constructor is intentionally empty
+    }
+
+    /**
+     * Creates a new message.
+     *
+     * @param text The message.
+     * @param isNotice The notice flag.
+     * @param isError The error flag.
+     * @param isPrivate The Private message
+     */
+    constructor(text: String, isNotice: Boolean, isError: Boolean, isPrivate: Boolean) {
+        this.text = text
+        this.isNotice = isNotice
+        this.isError = isError
+        this.isPrivate = isPrivate
+    }
+
+    /**
+     * Creates a new message.
+     *
+     * @param text The message.
+     * @param isNotice The notice flag.
+     * @param isError The error flag.
+     * @param isPrivate The Private message
+     * @param color The color.
+     */
+    constructor(
+        text: String,
+        isNotice: Boolean,
+        isError: Boolean,
+        isPrivate: Boolean,
+        color: String
+    ) {
+        this.text = text
+        this.isNotice = isNotice
+        this.isError = isError
+        this.isPrivate = isPrivate
+        this.color = color
+    }
+
+    override fun toString(): String {
+        return "Message(color='$color', isError=$isError, isNotice=$isNotice, isPrivate=$isPrivate, message='$text')"
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.java b/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
similarity index 73%
rename from src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.java
rename to src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
index 258d947..b7c0ad3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
@@ -29,38 +29,35 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package net.thauvin.erik.mobibot.msg;
+package net.thauvin.erik.mobibot.msg
 
 /**
- * The <code>NoticeMessage</code> class.
+ * The `NoticeMessage` class.
  *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
+ * @author [Erik C. Thauvin](https://erik.thauvin.net/)
  * @created 2019-04-07
  * @since 1.0
  */
-public class NoticeMessage extends Message {
+class NoticeMessage : Message {
     /**
      * Creates a new notice.
      *
-     * @param message The notice's message.
+     * @param text The notice's message.
      */
-    public NoticeMessage(final String message) {
-        super();
-        this.setMessage(message);
-        this.setNotice(true);
+    constructor(text: String) : super() {
+        this.text = text
+        isNotice = true
     }
 
     /**
      * Create a new notice.
      *
-     * @param message The notice's message.
-     * @param color   The color.
+     * @param text The notice's message.
+     * @param color The color.
      */
-    public NoticeMessage(final String message, final String color) {
-        super();
-        this.setMessage(message);
-        this.setNotice(true);
-        this.setColor(color);
+    constructor(text: String, color: String) : super() {
+        this.text = text
+        isNotice = true
+        this.color = color
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.java b/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
similarity index 75%
rename from src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.java
rename to src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
index 1079a4d..4f9d4e9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
@@ -29,32 +29,36 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package net.thauvin.erik.mobibot.msg;
+package net.thauvin.erik.mobibot.msg
 
 /**
- * The <code>PrivateMessage</code> class.
+ * The `PrivateMessage` class.
  *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
+ * @author [Erik C. Thauvin](https://erik.thauvin.net/)
  * @created 2019-04-09
  * @since 1.0
  */
-@SuppressWarnings("unused")
-public class PrivateMessage extends Message {
-    public PrivateMessage(final String message) {
-        super();
-        this.setMessage(message);
+@Suppress("unused")
+class PrivateMessage : Message {
+    /**
+     * Creates a new private message.
+     *
+     * @param text The message.
+     */
+    constructor(text: String) : super() {
+        this.text = text
+        isPrivate = true
     }
 
     /**
      * Creates a new private message.
      *
-     * @param message The message.
-     * @param color   The message color.
+     * @param text The message.
+     * @param color The message color.
      */
-    public PrivateMessage(final String message, final String color) {
-        super();
-        this.setMessage(message);
-        this.setColor(color);
+    constructor(text: String, color: String) : super() {
+        this.text = text
+        this.color = color
+        isPrivate = true
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.java b/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
similarity index 75%
rename from src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.java
rename to src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
index 3c4e924..2bd991b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
@@ -29,32 +29,34 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-package net.thauvin.erik.mobibot.msg;
+package net.thauvin.erik.mobibot.msg
 
 /**
- * The <code>PublicMessage</code> class.
+ * The `PublicMessage` class.
  *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
+ * @author [Erik C. Thauvin](https://erik.thauvin.net/)
  * @created 2019-04-07
  * @since 1.0
  */
-public class PublicMessage extends Message {
-    public PublicMessage(final String message) {
-        super();
-        this.setMessage(message);
+class PublicMessage : Message {
+    /**
+     * Creates a new public message.
+     *
+     * @param text The message.
+     */
+    constructor(text: String) : super() {
+        this.text = text
     }
 
     /**
      * Creates a new public message.
      *
-     * @param message The message.
-     * @param color   The message color.
+     * @param text The message.
+     * @param color The message color.
      */
-    @SuppressWarnings("unused")
-    public PublicMessage(final String message, final String color) {
-        super();
-        this.setMessage(message);
-        this.setColor(color);
+    @Suppress("unused")
+    constructor(text: String, color: String) : super() {
+        this.text = text
+        this.color = color
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
index 9291c4f..f72d74a 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
@@ -54,11 +54,11 @@ public class CurrencyConverterTest {
     @Test
     @SuppressFBWarnings("PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS")
     public void testConvertCurrency() {
-        assertThat(CurrencyConverter.convertCurrency("100 USD to EUR").getMessage())
+        assertThat(CurrencyConverter.convertCurrency("100 USD to EUR").getText())
                 .as("100 USD to EUR").matches("100\\.00 USD = \\d{2,3}\\.\\d{2} EUR");
-        assertThat(CurrencyConverter.convertCurrency("100 USD to USD").getMessage())
+        assertThat(CurrencyConverter.convertCurrency("100 USD to USD").getText())
                 .as("100 USD to USD").contains("You're kidding, right?");
-        assertThat(CurrencyConverter.convertCurrency("100 USD").getMessage())
+        assertThat(CurrencyConverter.convertCurrency("100 USD").getText())
                 .as("100 USD").contains("Invalid query.");
         assertThat(CurrencyConverter.currencyRates().size())
                 .as("currencyRates().size() == 33").isEqualTo(33);
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
index 13388bd..4b07647 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
@@ -63,20 +63,20 @@ public class GoogleSearchTest extends LocalProperties {
         try {
             List<Message> messages = GoogleSearch.searchGoogle("mobibot site:github.com", apiKey, cseKey);
             assertThat(messages).as("mobibot results not empty").isNotEmpty();
-            assertThat(messages.get(0).getMessage()).as("found mobitopia").contains("mobibot");
+            assertThat(messages.get(0).getText()).as("found mobitopia").contains("mobibot");
 
             messages = GoogleSearch.searchGoogle("aapl", apiKey, cseKey);
             assertThat(messages).as("aapl results not empty").isNotEmpty();
-            assertThat(messages.get(0).getMessage()).as("found apple").containsIgnoringCase("apple");
+            assertThat(messages.get(0).getText()).as("found apple").containsIgnoringCase("apple");
 
             assertThatThrownBy(() -> GoogleSearch.searchGoogle("test", "", "apiKey")).as("no API key").isInstanceOf(
-                ModuleException.class).hasNoCause();
+                    ModuleException.class).hasNoCause();
 
             assertThatThrownBy(() -> GoogleSearch.searchGoogle("test", "apiKey", "")).as("no CSE API key").isInstanceOf(
-                ModuleException.class).hasNoCause();
+                    ModuleException.class).hasNoCause();
 
             assertThatThrownBy(() -> GoogleSearch.searchGoogle("", "apikey", "apiKey")).as("no query").isInstanceOf(
-                ModuleException.class).hasNoCause();
+                    ModuleException.class).hasNoCause();
         } catch (ModuleException e) {
             // Avoid displaying api keys in CI logs
             if ("true".equals(System.getenv("CI"))) {
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
index d62cd2e..93836e7 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
@@ -51,7 +51,7 @@ public class JokeTest {
 
     @Test
     public void testRamdomJoke() throws ModuleException {
-        assertThat(Joke.randomJoke().getMessage().length() > 0).as("randomJoke() > 0").isTrue();
-        assertThat(Joke.randomJoke().getMessage()).as("randomJoke()").containsIgnoringCase("chuck");
+        assertThat(Joke.randomJoke().getText().length() > 0).as("randomJoke() > 0").isTrue();
+        assertThat(Joke.randomJoke().getText()).as("randomJoke()").containsIgnoringCase("chuck");
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
index b3a4971..5931cd5 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
@@ -58,7 +58,7 @@ public class StockQuoteTest extends LocalProperties {
         try {
             final List<Message> messages = StockQuote.getQuote("apple inc", apiKey);
             assertThat(messages).as("response not empty").isNotEmpty();
-            assertThat(messages.get(0).getMessage()).as("same stock symbol").contains("AAPL").contains("Apple Inc.");
+            assertThat(messages.get(0).getText()).as("same stock symbol").contains("AAPL").contains("Apple Inc.");
 
             try {
                 StockQuote.getQuote("012", apiKey);
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
index cf64b4d..b1514a9 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
@@ -74,6 +74,6 @@ public class TwitterTest {
             LocalProperties.getProperty(Twitter.TOKEN_SECRET_PROP),
             LocalProperties.getProperty(Constants.TWITTER_HANDLE_PROP),
             msg,
-            true).getMessage()).as("twitterPost(" + msg + ')').isEqualTo(msg);
+            true).getText()).as("twitterPost(" + msg + ')').isEqualTo(msg);
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
index f39c459..f22e049 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
@@ -54,12 +54,12 @@ public class Weather2Test extends LocalProperties {
     @Test
     public void testWeather() throws ModuleException {
         List<Message> messages = Weather2.getWeather("98204", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP));
-        assertThat(messages.get(0).getMessage()).as("is Everett").contains("Everett").contains("US");
-        assertThat(messages.get(messages.size() - 1).getMessage()).as("is City Search").endsWith("98204%2CUS");
+        assertThat(messages.get(0).getText()).as("is Everett").contains("Everett").contains("US");
+        assertThat(messages.get(messages.size() - 1).getText()).as("is City Search").endsWith("98204%2CUS");
 
         messages = Weather2.getWeather("London, UK", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP));
-        assertThat(messages.get(0).getMessage()).as("is UK").contains("London").contains("UK");
-        assertThat(messages.get(messages.size() - 1).getMessage()).as("is City Code").endsWith("4517009");
+        assertThat(messages.get(0).getText()).as("is UK").contains("London").contains("UK");
+        assertThat(messages.get(messages.size() - 1).getText()).as("is City Code").endsWith("4517009");
 
         assertThatThrownBy(
             () -> Weather2.getWeather("Montpellier, FR", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP))).as(
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
index 7f623ff..6d6e630 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
@@ -47,9 +47,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class WordTimeTest {
     @Test
     public void testWorldTime() {
-        assertThat(WorldTime.worldTime("PST").getMessage()).as("PST").endsWith(Utils.bold("Los Angeles"));
+        assertThat(WorldTime.worldTime("PST").getText()).as("PST").endsWith(Utils.bold("Los Angeles"));
         assertThat(WorldTime.worldTime("BLAH").isError()).as("BLAH").isTrue();
-        assertThat(WorldTime.worldTime("BEATS").getMessage()).as("BEATS").contains("@");
+        assertThat(WorldTime.worldTime("BEATS").getText()).as("BEATS").contains("@");
     }
 
     @Test

From b99a2f568e6b991b34d9cb39763e3bb9f3d0cf3c Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 1 Apr 2020 20:00:51 -0700
Subject: [PATCH 036/262] Fixed defaultTags.

---
 .../erik/mobibot/commands/links/UrlMgr.kt     | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
index de2db08..b07d909 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -45,8 +45,8 @@ import org.jsoup.Jsoup
 import java.io.IOException
 
 class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
-    private val keywords = ArrayList<String>()
-    private val tags = ArrayList<String>()
+    private val keywords: List<String>
+    private val defaultTags: List<String>
     override val command = Constants.LINK_CMD
     override val help = emptyList<String>()
     override val isOp = false
@@ -54,8 +54,8 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
     override val isVisible = false
 
     init {
-        this.keywords.addAll(keywords.split(TAG_MATCH.toRegex()))
-        tags.addAll(defaultTags.split(TAG_MATCH.toRegex()))
+        this.keywords = keywords.split(TAG_MATCH.toRegex())
+        this.defaultTags = defaultTags.split(TAG_MATCH.toRegex())
     }
 
     companion object {
@@ -132,6 +132,7 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
             if (!isDupEntry(bot, sender, link, isPrivate)) {
                 val isBackup = saveDayBackup(bot)
                 var title = Constants.NO_TITLE
+                val tags = ArrayList<String>(defaultTags)
                 if (cmds.size == 2) {
                     val data = cmds[1].trim().split("${Tags.COMMAND}:", limit = 2)
                     title = data[0].trim()
@@ -140,7 +141,7 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
                     }
                 }
                 title = fetchTitle(link, title)
-                tags.addAll(matchTagKeywords(title))
+                matchTagKeywords(title, tags)
 
                 entries.add(EntryLink(link, title, sender, login, bot.channel, tags))
                 val index: Int = entries.size - 1
@@ -182,13 +183,17 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
     private fun fetchTitle(link: String, title: String): String {
         if (Constants.NO_TITLE == title) {
             try {
-                val html = Jsoup.connect(link).userAgent("Mozilla").get()
+                val html = Jsoup.connect(link)
+                    .userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/74.0")
+                    .get()
                 val htmlTitle = html.title()
                 val split = htmlTitle.split("( \\| )".toRegex(), 2)
-                return if (split.size == 2) {
+                return if (split.size == 2 && split[0].isNotBlank()) {
                     split[0]
-                } else {
+                } else if (htmlTitle.isNotBlank()) {
                     htmlTitle
+                } else {
+                    title
                 }
             } catch (ignore: IOException) {
                 // Do nothing
@@ -210,17 +215,13 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
         return false
     }
 
-    private fun matchTagKeywords(title: String): List<String> {
-        val matches = ArrayList<String>()
-        if (keywords.isNotEmpty()) {
-            for (match in keywords) {
-                val m = match.trim()
-                if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
-                    matches.add(m)
-                }
+    private fun matchTagKeywords(title: String, tags: ArrayList<String>) {
+        for (match in keywords) {
+            val m = Regex.escape(match.trim())
+            if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
+                tags.add(m)
             }
         }
-        return matches
     }
 
     private fun saveDayBackup(bot: Mobibot): Boolean {

From b73ffc061d5c831d7d245897558f658ed73041b3 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 1 Apr 2020 20:31:14 -0700
Subject: [PATCH 037/262] Added source & traget compatibility.

---
 build.gradle | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/build.gradle b/build.gradle
index 8d75ae5..6c69e9e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -83,6 +83,17 @@ test {
     }
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_9
+    targetCompatibility = JavaVersion.VERSION_1_9
+}
+
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = '9'
+    }
+}
+
 spotbugs {
     toolVersion.set("$versions.spotbugs")
 }

From fc35b6bfc8b950e7c664feada0103a319691986b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 16 Apr 2020 15:40:30 -0700
Subject: [PATCH 038/262] Changed sendCommandsList to sendList.

---
 .../java/net/thauvin/erik/mobibot/Mobibot.java     | 14 +++++++-------
 .../net/thauvin/erik/mobibot/commands/Ignore.kt    |  2 +-
 .../net/thauvin/erik/mobibot/commands/Modules.kt   |  2 +-
 .../net/thauvin/erik/mobibot/commands/Users.kt     |  4 ++--
 .../erik/mobibot/modules/CurrencyConverter.java    |  4 ++--
 .../thauvin/erik/mobibot/modules/WorldTime.java    |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index ffded5d..bc94f0c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -655,10 +655,10 @@ public class Mobibot extends PircBot {
             Collections.sort(opsCommandsNames);
         }
 
-        sendCommandsList(sender, commandsNames, 8, isPrivate, true);
+        sendList(sender, commandsNames, 8, isPrivate, true);
         if (isOp) {
             send(sender, "The op commands are:", isPrivate);
-            sendCommandsList(sender, opsCommandsNames, 8, isPrivate, true);
+            sendList(sender, opsCommandsNames, 8, isPrivate, true);
         }
     }
 
@@ -994,11 +994,11 @@ public class Mobibot extends PircBot {
      * @param isPrivate The private flag.
      * @param isBold    The bold flag
      */
-    public final void sendCommandsList(final String nick,
-                                       final List<String> list,
-                                       final int size,
-                                       final boolean isPrivate,
-                                       final boolean isBold) {
+    public final void sendList(final String nick,
+                               final List<String> list,
+                               final int size,
+                               final boolean isPrivate,
+                               final boolean isBold) {
         for (int i = 0; i < list.size(); i += size) {
             send(nick, Utils.helpIndent(
                     String.join(" ", list.subList(i, Math.min(list.size(), i + size))), isBold), isPrivate);
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index ffc42a0..79c6a08 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -144,7 +144,7 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
 
         if (ignored.size > 0) {
             bot.send(sender, "The following nicks are ignored:", isPrivate)
-            bot.sendCommandsList(sender, ignored.toList(), 8, isPrivate, true)
+            bot.sendList(sender, ignored.toList(), 8, isPrivate, true)
         } else {
             bot.send(sender, "No one is currently ${Utils.bold("ignored")}.", isPrivate)
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index 0d02f05..e997677 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -59,7 +59,7 @@ class Modules : AbstractCommand() {
                 bot.send(sender, "There are no enabled modules.", isPrivate)
             } else {
                 bot.send(sender, "The enabled modules are: ", isPrivate)
-                bot.sendCommandsList(sender, modulesNames, 7, isPrivate, false)
+                bot.sendList(sender, modulesNames, 7, isPrivate, false)
             }
         } else {
             bot.helpDefault(sender, isOp, isPrivate)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index 9ee5add..73524f3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -60,12 +60,12 @@ class Users : AbstractCommand() {
         val nicks = ArrayList<String>()
         users.forEach { user ->
             if (bot.isOp(user.nick)) {
-                nicks.add('@'.toString() + user.nick)
+                nicks.add("@${user.nick}")
             } else {
                 nicks.add(user.nick)
             }
         }
 
-        bot.send(sender, nicks.sorted().joinToString(" "), isPrivate)
+        bot.sendList(sender, nicks.sorted(), 8, isPrivate, false)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
index 03a7737..c6c3fce 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
@@ -218,7 +218,7 @@ public final class CurrencyConverter extends ThreadedModule {
             }
         } else if (query.contains(CURRENCY_RATES_KEYWORD)) {
             bot.send(sender, "The currency rates for " + Utils.bold(pubDate) + " are:", isPrivate);
-            bot.sendCommandsList(sender, currencyRates(), 3, isPrivate, false);
+            bot.sendList(sender, currencyRates(), 3, isPrivate, false);
         } else {
             helpResponse(bot, sender, isPrivate);
         }
@@ -250,7 +250,7 @@ public final class CurrencyConverter extends ThreadedModule {
                                                        bot.getNick(),
                                                        isPrivate)), isPrivate);
             bot.send(sender, "The supported currencies are: ", isPrivate);
-            bot.sendCommandsList(sender, new ArrayList<>(EXCHANGE_RATES.keySet()), 11, isPrivate, false);
+            bot.sendList(sender, new ArrayList<>(EXCHANGE_RATES.keySet()), 11, isPrivate, false);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
index 91fb27c..2eaa86c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
@@ -225,7 +225,7 @@ public final class WorldTime extends AbstractModule {
                                 final boolean isPrivate) {
         if (args.length() == 0) {
             bot.send(sender, "The supported countries/zones are: ", isPrivate);
-            bot.sendCommandsList(sender, new ArrayList<>(COUNTRIES_MAP.keySet()), 17, false, false);
+            bot.sendList(sender, new ArrayList<>(COUNTRIES_MAP.keySet()), 17, false, false);
         } else {
             final Message msg = worldTime(args);
             if (isPrivate) {

From c9366d856f227f25276818f819bb5b2b5da3f21d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 16 Apr 2020 15:51:43 -0700
Subject: [PATCH 039/262] Fixed title parsing.

---
 .../erik/mobibot/commands/links/UrlMgr.kt     | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
index b07d909..1a6cd77 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -131,7 +131,7 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
             val link = cmds[0].trim()
             if (!isDupEntry(bot, sender, link, isPrivate)) {
                 val isBackup = saveDayBackup(bot)
-                var title = Constants.NO_TITLE
+                var title = ""
                 val tags = ArrayList<String>(defaultTags)
                 if (cmds.size == 2) {
                     val data = cmds[1].trim().split("${Tags.COMMAND}:", limit = 2)
@@ -140,8 +140,14 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
                         tags.addAll(data[1].split(TAG_MATCH.toRegex()))
                     }
                 }
-                title = fetchTitle(link, title)
-                matchTagKeywords(title, tags)
+
+                if (title.isBlank()) {
+                    title = fetchTitle(link)
+                }
+
+                if (title != Constants.NO_TITLE) {
+                    matchTagKeywords(title, tags)
+                }
 
                 entries.add(EntryLink(link, title, sender, login, bot.channel, tags))
                 val index: Int = entries.size - 1
@@ -180,26 +186,19 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
         return message.matches(LINK_MATCH.toRegex())
     }
 
-    private fun fetchTitle(link: String, title: String): String {
-        if (Constants.NO_TITLE == title) {
-            try {
-                val html = Jsoup.connect(link)
-                    .userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/74.0")
-                    .get()
-                val htmlTitle = html.title()
-                val split = htmlTitle.split("( \\| )".toRegex(), 2)
-                return if (split.size == 2 && split[0].isNotBlank()) {
-                    split[0]
-                } else if (htmlTitle.isNotBlank()) {
-                    htmlTitle
-                } else {
-                    title
-                }
-            } catch (ignore: IOException) {
-                // Do nothing
+    private fun fetchTitle(link: String): String {
+        try {
+            val html = Jsoup.connect(link)
+                .userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/74.0")
+                .get()
+            val title = html.title()
+            if (title.isNotBlank()) {
+                return title
             }
+        } catch (ignore: IOException) {
+            // Do nothing
         }
-        return title
+        return Constants.NO_TITLE
     }
 
     private fun isDupEntry(bot: Mobibot, sender: String, link: String, isPrivate: Boolean): Boolean {
@@ -217,9 +216,9 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
 
     private fun matchTagKeywords(title: String, tags: ArrayList<String>) {
         for (match in keywords) {
-            val m = Regex.escape(match.trim())
+            val m = Regex.escape(match)
             if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
-                tags.add(m)
+                tags.add(match)
             }
         }
     }

From e022bc90ff3109471e6e0f2dccf85c4390a2e7f6 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 16 Apr 2020 16:10:07 -0700
Subject: [PATCH 040/262] Updated dependencies.

---
 .idea/compiler.xml                            |  6 +-----
 .idea/misc.xml                                |  2 +-
 .idea/mobibot.iml                             |  4 ++--
 .idea/modules/mobibot.main.iml                | 11 +++++-----
 .idea/modules/mobibot.test.iml                |  8 ++++----
 build.gradle                                  | 20 +++++++++----------
 detekt-baseline.xml                           |  1 +
 licenses/LICENSE.txt                          |  2 +-
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |  6 +++---
 version.properties                            |  6 +++---
 10 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index bec3928..a87304a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -21,10 +21,6 @@
         <module name="mobibot.main" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="mobibot" target="14" />
-      <module name="mobibot.main" target="14" />
-      <module name="mobibot.test" target="14" />
-    </bytecodeTargetLevel>
+    <bytecodeTargetLevel target="1.9" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 52412b4..c88ae8f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,5 +6,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_13" default="false" project-jdk-name="14" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="14" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 771bd41..6dcb7d2 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+157" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_14" inherit-compiler-output="true">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+289" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 6f0fcd0..b3165e0 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+157" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+289" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
+      <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
         <compilerSettings>
           <option name="additionalArguments" value="-Xallow-no-source-files" />
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.5.0-RC1/9203d2fdfba9923294f8b679f52136ce13f97575/okhttp-4.5.0-RC1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
+          <option name="jvmTarget" value="9" />
           <option name="languageVersion" value="1.3" />
           <option name="apiVersion" value="1.3" />
           <option name="pluginOptions">
@@ -35,7 +36,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_14">
+  <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/../../build/classes/java/main" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/generated/java">
@@ -59,7 +60,7 @@
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.4.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.5.0-RC1" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20190722" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index cfdf045..a9fac3b 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+157" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+289" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.4.1/d2e71a032b1927539c07adc3a9f36336d6fbf4b9/okhttp-4.4.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.5.0-RC1/9203d2fdfba9923294f8b679f52136ce13f97575/okhttp-4.5.0-RC1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -41,7 +41,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_14">
+  <component name="NewModuleRootManager">
     <output-test url="file://$MODULE_DIR$/../../build/classes/java/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../src/test">
@@ -60,7 +60,7 @@
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.4.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.5.0-RC1" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20190722" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
diff --git a/build.gradle b/build.gradle
index 6c69e9e..a42e6de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,11 +4,11 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.28.0'
     id 'com.github.spotbugs' version '4.0.5'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.7.2'
+    id 'io.gitlab.arturbosch.detekt' version '1.7.4'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.71'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
     id 'org.sonarqube' version '2.8'
     id 'pmd'
 }
@@ -21,13 +21,11 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 
 mainClassName = packageName + '.Mobibot'
 
-ext {
-    versions = [
-        kotlin : '1.3.71',
-        log4j : '2.13.1',
-        spotbugs : '4.0.1'
-    ]
-}
+ext.versions = [
+        kotlin  : '1.3.72',
+        log4j   : '2.13.1',
+        spotbugs: '4.0.1'
+]
 
 repositories {
     mavenLocal()
@@ -51,7 +49,7 @@ dependencies {
     implementation 'commons-cli:commons-cli:1.4'
 
     implementation 'commons-net:commons-net:3.6'
-    implementation 'com.squareup.okhttp3:okhttp:4.5.0-RC1'
+    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
 
     implementation 'com.rometools:rome:1.12.2'
 
@@ -125,7 +123,7 @@ tasks.withType(io.gitlab.arturbosch.detekt.Detekt) {
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
     options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
-    options.compilerArgs += [ "-Asemver.project.dir=$projectDir" ]
+    options.compilerArgs += ["-Asemver.project.dir=$projectDir"]
 }
 
 compileJava {
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 8af6eed..6f5dcde 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -13,6 +13,7 @@
     <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
     <ID>MagicNumber:UrlMgr.kt$UrlMgr$1000L</ID>
     <ID>MagicNumber:UrlMgr.kt$UrlMgr$60L</ID>
+    <ID>MagicNumber:Users.kt$Users$8</ID>
     <ID>MagicNumber:View.kt$View$8</ID>
     <ID>NestedBlockDepth:Comment.kt$Comment$commandResponse</ID>
     <ID>NestedBlockDepth:UrlMgr.kt$UrlMgr$commandResponse</ID>
diff --git a/licenses/LICENSE.txt b/licenses/LICENSE.txt
index 4efe703..37785b0 100644
--- a/licenses/LICENSE.txt
+++ b/licenses/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 00d806e..2836f6f 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1585467573570L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1587078052972L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "alpha";
-    public static final String BUILDMETA = "105";
-    public static final String VERSION = "0.8.0-alpha+105";
+    public static final String BUILDMETA = "294";
+    public static final String VERSION = "0.8.0-alpha+294";
 
     /**
      * Disables the default constructor.
diff --git a/version.properties b/version.properties
index 3f02b34..6e5c59b 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sun Mar 29 00:39:32 PDT 2020
-version.buildmeta=105
+#Thu Apr 16 16:00:41 PDT 2020
+version.buildmeta=294
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=alpha
 version.project=mobibot
-version.semver=0.8.0-alpha+105
+version.semver=0.8.0-alpha+294

From bcf659c5a830a4b88ba9756457b1b25d41264f8b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 27 Apr 2020 23:16:14 -0700
Subject: [PATCH 041/262] Updated dependencies.

---
 .idea/mobibot.iml                        |   2 +-
 .idea/modules/mobibot.main.iml           |  34 ++++++++++-----------
 .idea/modules/mobibot.test.iml           |  36 +++++++++++------------
 build.gradle                             |  13 ++++----
 gradle/wrapper/gradle-wrapper.jar        | Bin 58694 -> 58910 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 ++
 gradlew.bat                              |   1 +
 8 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 6dcb7d2..19d441c 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+289" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+299" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index b3165e0..a2d494c 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+289" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+299" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.5.0-RC1/9203d2fdfba9923294f8b679f52136ce13f97575/okhttp-4.5.0-RC1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.5.0/cfd127ae6de4862daa93e15ceae9291108eaabc5/okhttp-4.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.5.0/b6b52caca243e75a8fbb95ff6ec9de6b2bdb1481/okio-jvm-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -20,11 +20,11 @@
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.71/7f5522e7a9d1736fabfdb4335630f64504ce8f20/kotlin-script-runtime-1.3.71.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.3.71/80b8eb0986d1391e6a1dcf9aba968d59165dc4f/kotlin-scripting-common-1.3.71.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.3.71/ee1ba4f199415255ea6ea55cc5dc41856b2729fd/kotlin-scripting-jvm-1.3.71.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.72/657d8d34d91e1964b4439378c09933e840bfe8d5/kotlin-script-runtime-1.3.72.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.3.72/e09990437040879d692655d66f58a64318681ffe/kotlin-scripting-common-1.3.72.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.3.72/7dde2c909e6f1b80245c7ca100d32a8646b5666d/kotlin-scripting-jvm-1.3.72.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.2.1/3839faf625f4197acaeceeb6da000f011a2acb49/kotlinx-coroutines-core-1.2.1.jar" />
               <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
             </array>
@@ -51,33 +51,33 @@
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.2" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.5.0-RC1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20190722" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.71" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.4.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index a9fac3b..2031057 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+289" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+299" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.1/533f6ae0bb0ce091493f2eeab0c1df4327e46ef1/log4j-core-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.1/79e92fe5b6c30cc4c8a52893378d4d130e298c65/log4j-slf4j-impl-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.1/cc670f92dc77bbf4540904c3fa211b997cba00d8/log4j-api-2.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.5.0-RC1/9203d2fdfba9923294f8b679f52136ce13f97575/okhttp-4.5.0-RC1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.71/4defc79915cf4f78b49bbc4a8f1e80e87767a5b/kotlin-stdlib-jdk8-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.71/9180d3aec3f0b2ea6ef0dcf01b464a6e2219e381/kotlin-stdlib-jdk7-1.3.71.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.1/192f5794e6aa74968a883ecdf5bf7d961843579f/spotbugs-annotations-4.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.3/d946f785445d73c6bc99bbd778576d2576e37ea9/okio-jvm-2.4.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.5.0/cfd127ae6de4862daa93e15ceae9291108eaabc5/okhttp-4.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.5.0/b6b52caca243e75a8fbb95ff6ec9de6b2bdb1481/okio-jvm-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -25,11 +25,11 @@
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.71/7f5522e7a9d1736fabfdb4335630f64504ce8f20/kotlin-script-runtime-1.3.71.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.3.71/80b8eb0986d1391e6a1dcf9aba968d59165dc4f/kotlin-scripting-common-1.3.71.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.3.71/ee1ba4f199415255ea6ea55cc5dc41856b2729fd/kotlin-scripting-jvm-1.3.71.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.71/e71c3fef58e26affeb03d675e91fd8abdd44aa7b/kotlin-stdlib-common-1.3.71.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.71/898273189ad22779da6bed88ded39b14cb5fd432/kotlin-stdlib-1.3.71.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.72/657d8d34d91e1964b4439378c09933e840bfe8d5/kotlin-script-runtime-1.3.72.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.3.72/e09990437040879d692655d66f58a64318681ffe/kotlin-scripting-common-1.3.72.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.3.72/7dde2c909e6f1b80245c7ca100d32a8646b5666d/kotlin-scripting-jvm-1.3.72.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.2.1/3839faf625f4197acaeceeb6da000f011a2acb49/kotlinx-coroutines-core-1.2.1.jar" />
               <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
             </array>
@@ -52,41 +52,41 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="mobibot.main" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.2" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.5.0-RC1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20190722" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.71" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.71" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.2" level="project" />
     <orderEntry type="library" name="Gradle: org.testng:testng:7.2.0" level="project" />
     <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.71" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.4.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: com.google.inject:guice:no_aop:4.2.2" level="project" />
     <orderEntry type="library" name="Gradle: com.beust:jcommander:1.72" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.10.3" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:guava:25.1-android" level="project" />
     <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
diff --git a/build.gradle b/build.gradle
index a42e6de..693e640 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,9 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.28.0'
-    id 'com.github.spotbugs' version '4.0.5'
+    id 'com.github.spotbugs' version '4.0.7'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.7.4'
+    id 'io.gitlab.arturbosch.detekt' version '1.8.0'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
@@ -22,9 +22,8 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
-        kotlin  : '1.3.72',
-        log4j   : '2.13.1',
-        spotbugs: '4.0.1'
+    log4j   : '2.13.2',
+    spotbugs: '4.0.2'
 ]
 
 repositories {
@@ -62,8 +61,8 @@ dependencies {
 
     implementation 'net.aksingh:owm-japis:2.5.3.0'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
+    implementation platform('org.jetbrains.kotlin:kotlin-bom')
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib'
 
     testImplementation 'org.testng:testng:7.2.0'
     testImplementation 'org.assertj:assertj-core:3.15.0'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 490fda8577df6c95960ba7077c43220e5bb2c0d9..62d4c053550b91381bbd28b1afc82d634bf73a8a 100644
GIT binary patch
delta 6447
zcmY*dbyQSczlH%shY+L(kQ}<ZrKL-{8%Ct05oQD(8i_-S(%s!4APv$W-3`(RNO*a<
z-+R~n&OiI9z1HvSwbwaoJ>C6ise@?c@F%#`dE9xT=qM=Dm?$VxD1hrECD1a#01Q8o
zMyT3}z+1K>hPE%4doH=x5X;^NP(OFD5GByp;5FQ^bpzkBa(;eudMu7Iyv$DE+N=>p
z{3Y5_BP>F3)tXW*Styc(Ji3jnK-giGA_&42fsbZ@#+e+ly3w0VmLC;LA)h1UY(ChA
zfwqQ?-@}@S93F|exOv;Se;P|SrYvEG(8q&|ltqvQHO9KgCSwM!Y<pq`w?Ka$d+%f(
z#`|j)tp8G?Hr{CTY9|S=)hl`P1s|?ikBT;cf2TNC^I;r&3uwagX6sF54myg~qb*hS
znIj@8Jgw?TTd%@}eLgjf5q&jZx8bHrhP$~Bmf0$=?<i6$e`WoMb!$vy{YXg;5&gYj
z!JG0=l)d(6*#cWubg_Khpv`(CVrWo;^&N}ZI!q6JN132ua65mnZ#gFxyKUsMJekJu
z%oq$=M;hU7=2vE6Z~D5BaVtIUa<KBtNN|;Y>+#d5eIRq$Mi`pU__N$FTxW@KAWIw=
zayY6@9EyxG<_tr&{Wi87m5*mf=u&=;eL1gf{Mt)q8Drick8CcxzLW>cG~TbW)|$*D
zYMc|5eZNNzt7O_C1Lqg<?~Lyqnr8$>aI`Z0B+2#;3yO;E7N4oMY@~7$4;MRonU+Ca
z#*cD!7$u9pZ|3f!-_6rpN}XhAWd`1qiR{e*1CJK1dvBsjUyY@BuT|;EAz}*0uSwT_
zq(g0jXTAK4wsQ>kIKEfRQZw^GIKNRZmV)b;c*Kpc?IvNuq{+eCM4%<l0Y2~W`GT-x
z)`=@?r=qo4)VE>IBoRUk!JeJ4IVH!pLl+5gQn^$0Fw(WROw~SclOYWbMmvR+x&lYa
zrU`5lck*s2zl;n6HEa_E|Btu!_BeeF8T=~0Z-pdJsKtN8nr88*8loznbI`@@8U-bc
zCE&MaHH#?LN;6&wU%>->{X&6n*c6ECkP#Bn{lafo9KW+AKK>>f)YfzG#t`XCsl$WX
z<O`qRN5Eirgxn2hvBw;{w9&<UUAxrSu}dR1f7vbkU(WceE4)a5`eGFwuC=e#nLHve
zjkC&3Pt+uJ7R{gS*|KX)^~=NlSRbok=eAH2u95X6GPz*rfM}ve#m-4meY+0f@-YcX
z@aLTnwJ_tEPLiys=OqV3I!O)cUbyPWhqIeTEiztOmVSIki6J40USbGQPye(&tUY0t
z&;4zc6i#=Y=DzA>eS|50l&G{J6yrdD0#njv3|C}K(~azN%1+c#<gNh}VJrnA_Gnw!
z`Z#eU3wSln3{0#$lu_~32jtRU1)GIFm$p=ei5J=5nP;8j6a6}*H1ux{BJObmv&#<V
zY@K>*-JXtZd=Rs-zr)f{Mneaqpgewz^3OM5FaDaH3?RpqMyL}=5sFu_zcDc^E~=$H
zp`mutZ0ahrf32c`6ROBh&lI`>vuFJE*(NVpjr~^d53MZ0v$G#mHqBLpZ_=3?pNjHc
zq`Dn6xbc32BSg`U@YE?)%%`LvRRWt@NnS4GSj=p><<_-c6l`myAJE0fSp^QbBfdS(
zl>BC`;EiMtvPQ^FVSL|sjTc(?b%8Qt@%U>rt&`4_cYT+R`OvMomf#104S~4%y%G=i
zSF$4cuIxlIe>@1E=sfXhVt@RqP-*grJnW~;iWiY{&Bqh7J|{vYQ!^1x4cnyGk6Wb9
zO0~}ejH&5@<jOQ|dtbP|cs5Ig%Q9C#T)rI1)@&$XV)PD*2x`E3k3E#TpZ{6^smft8
zpgnr2K=(m$tiFxlyY;I*-3psO{!7ID-5>bEj&`2?Wl*cf=IV=$oa9rzh+#gN?j{IY
z{cFM?b1*TT+&S2rOIFFvy{`FvX}_js+9rw1O*1ySv8Q}r2b0<mLo>@*h|1Di0R1v*
zVt<A-d8Be|9r0R~S&bpq)S{^)no7&E$&x`#JX3XWyh!o8-xGb?=yVdv`y25YwOjYM
zg?~mQlI^x<ZJDODZIJO%TbG9+&`Yz#_$?#9Z{r)?al7hs^Fd0lUufB_t78&hhV$NX
zjJ~Ify_MQZqj%+_{`w+;!TixH|DCOBLw~b3^=0$i>4yRX`%ac3xeH;(y!FJ1wfX0u
z(vEf<w1M0^l>fdladd}+qfb##M5s|vX#V+!&>>0;o_Le@c)+7jDwJJ(9>+3CRkG<b
zc8$k+#8z6yWYQ}%%SOl17{n&F#ePJ$T<MYyCYXyMm~pkd3i+xGixp7aqo}2W;xi>H
z##M)o)xY%3-ifK*iFpo7NiBT`wYVc=lYIZtKF{pxNfod2V)Ml&<=??l)7w5)Glopn
z8#scqBz@^rE2-5aVDT_~Q#A7m4S6@B{QM6c_oY?)xk>z8r!qnbkvnqHoIRTMZijQ5
zv*ir-hjrA??C7S({;peDbjO+Kk0=tpoYQr7VQMJ*cR43<hpOxBsobeL%WYMnX*NQ0
z+pOz!N%r(G(?^x>?@CVMwg=}e<87k-T@wQ2`}bwe-}AAk?H=&0Yz~Zbk~bc>EP@tV
zZ}M>Z2br)mwHOaQS1^~;AVlgQS(~eqTT3cQ)Jq8?bKk~$>tZSLgMW6sF{Os2*%OD^
z#@G{w=c@536Pgy5n{C*b?yf@Kd`v9zOG*56432l!^U3K)m1;qIzM*3ZS)XJnJ4THC
z^e*Y&BQ)hyIA?LzXpqWK1`GN&gr?{?;qw?0wZ2-3WO3HI;)oY4YL?q5>F9QpzV?jw
z%Ae1D+te?r(`vL~!tzayt@-830@#ZS)-KyoF0$s!Vw0Vud%!J!?moY0m8#gODn9F+
zY?TnB<k6#5iz?4RrC>MwOKomVz60?|&V3HO!Z!cH+<9qbk>I-tT86n9=X9g`Zr=G+
zeJZH~&WtV__tcQ~B#c3;HnlwX+<R7|0Vt@nvOiob4Is!^j^SXyZ4B8BEoelfJ1<G<
zF}Y{Dy|8YQ?KC&BGjn#<+oI<CLW=#{{Tv4;b^D2@7p9C!(hNbz>UoXIT>zqV;hho>
zm(S|vbkcOsiPJd5fwJn%e%@Z(YNs#TqQ-MTQNPf9zDS)^#q=x)hn0wzK&7Tn_|BdK
zx}|&Y!FqT|pVs!!ayLJ%C$M2LMR|s6aQ%QUi>oqMG=a-^oPaKfKR>DyX9dBV*%R!+
z%FvBF>KN67w@!4Lj7{*vhaGWkP<w4#=W5ic64Bi~mcT9Als#v19$3I)y%+OJ+;?my
z65=sI%e`CmmLO<Bgb&ZXx^r-<rJ|mOpUIbxMMdT{Q57vlmVEywD22&nmqQGSi5;E1
zmWrjTqnaI;1-Y(tl$Df-jeb)PHe(U~O3c}IzCvVW784gVCY6-yV+<m`7PfcnM8|C#
zMWVoyDg2B|lHQGM3YLomqvNy&m?&fYIFP4-Muc#IiFx7{xp^sh=<=}NaS2!?!9<<K
zE{#cfCpQGA6Keq&xdqqR6P3iSbX!-rKoZjzZLL4~+}2%oS7l8mE8<`;=4QPWfAFE6
zP?Fsz?ga@}E^=E@1VRp<#+}1r&o2Cp8Wy)lh-q+Yn4GO$cTj9V+8%ujXi)(kv5v2a
z#UQULxg3(pQ|ok~Bx}uHQp6dPl`~T8Iapp5Ui|#~b3y!78w|e$Zb)$L)IP-}zYNco
zcl`bcOLu>344{vG@LFna%+6y+SB#;an8bz1SAoZg)%>it7$I$^*bWXoT6hbhk;!C7
z5tAKrT@VO5N!8a8G3=U4NL5yNqYdEsc2}2^o5ctj;Hrf0Dk~j<XUk(k!m_e>L|srk
z+XuB%H@ROKFqLw>LUu0bqRXw}B*R!OLo6|5*Q4|0dPlcG;>@4(_<TPumX7*V^83b_
z8(fPq)o$VpAtV*nKR{YOEEbH)`GWCD>wZ})Yf&doH+L*RE=D|Z6RxTU#a|+qO_A4p
z2U{|br!ER>QqRY>(awtH6L-S8zx$EeC$o;?KH-zEE{_f%M55>lLD!d9KbLpEyv&z3
zOD}@>1Exq4<jN18H;|>C9v6urtETRrtB>6m;qqJfh)6o@&+S>@D45s~ccePF=|y`U
z-f~hKH|y8x$ovl1NJi3Qqom;ERzIG#^&!~fFQcyl0+H+;`yV@UyA|P*R^h1K*<8h{
zZqjSxw79HGC?HMzs;UY)%J2b0gXnQ=OY;dHMi3-zr7BZ6SnFxTu8VCoySbgs>l^A8
zmN&kvh~36=TRu2B!zInA7+dp6$aaef-&PgtbENZDyV(2Qh!`{>wDfZGw=1SFg*E{+
z#RVlY)C{0iP0+Q52$nQ<NqM7|ixuqk^z6~Q3ydHw%a_-fnAd2}q|mzXAYAI?x{~T`
zGt6{>XhK{cVx<)i;=tyb=4mRyl7vX}F8Q%QL>_d6O7MM}r2)$$y+>m{$P8lbYz;fZ
z3QWqj-`0^M+YpnVm!KE9$7?qn-uiDEF=*G=DW84fhX*c2c78!Mp!igEq_TE#1gLe8
zl$ro$nqM(yq<G1lUaHefu=r`N<z2!qo$XzmPdy{kR_wwr-zt+Nw3+3;Pfv9e7R7fa
zLxe&z+26Sv)eS>&C?t-G#o9^eY1)Q9PX&YrAtOX|lboS9pTS>3XVy+T*%QF@Dx%R!
zi~z%gEL!?kG{Q%?*cWYwt#5W}g>qQ?$$RX%E0(03W7ZERFNIOjpM5e?6J0JAro(i1
zsQeyE7G{}iSZNnP(n4FwvEp+ztGzd?jYx+(7Mk46X^c!>`oO7{i_yo>FV+t|SvS!}
zBkOPHlUb!OPh1Y-8duD(b2u@P=5b8soW*+wnMY4Q8Eq!-L)~5b=n{68|ISew8k>Nt
zjw!awOP?W8P1$OO`+#?*f{M(%*J<Z}HdV=L-L`2gF%sX?N-$?B<xjHXRh5?hKu{j@
zlGqM+7T6Ce^*LPQ$HhA;{oN3D6MRW1e>)%E_^tKqR(nv#swuRijXecgwQacnz4TE8
z=2-p0u+VG&&^ePGuUHKIgI+h>XY*ZqAI5N*4Wc%8CXbXf57?Mpl#k^M=OHx26*X=b
z@XIHOwsp{@XZ?Foo*@>FnvH!0EQsZ*BR?l&zm|TjE+bDiqA$Y2SY>Copx~1PHa4js
z_!C`yon1&oi{Kr00~T|`DcYfvr^uu*F03OLS>^N@6Zi4VhFx(|WVY7whxD`RzX@{a
zbt^j09cW#7p^J^3)}YLkrHR`G;mbL@W6__7SC=}Xh$OzjG!>tu=ubtG%LthmSDE)Y
zfp>6T8@qS6C@y(<;eHyUqHzM9+%$!LWjRr*z1Qw1s?bAYrK7*KD*C^qP<M_eiv4;U
zb`+-cL;Yy;k#L~%_Zvq-sVoFX%BdxYG1S<#v&8>{<R;<co=wxj1Llg&?JxXDt<C0K
z_LfPCFZjw|1k`EZqDn$*+lU)j9HN2%cTdPJyv)%f$CF6{GOxQNYz7W1PV#X$jrctE
z(P_A{uyfNndH$C>W=T31H#9%+CXSZ;mJdIE6lN%IxBUk0hr5P})$QDM>4>ow%muHv
z-zVTS+rI9+PV|%56*~qa^GKRWwz;dLtoUR%*1M}RGh$LcGlrHaAh-`>BW&!A6mvv(
zo}57{BhH+Bqiza~XoxEIpXk_BGR8GzhcQwT4ND>~ahppmV*4SGve=@GE0zZGn}Z_l
zMJ~Bi7prl4W<5m=nXZVtIYs=mwv2O*-UXG(Y9#Tfu8=c%NzSja+#d#gJ}FZhj)shN
zMhx$^a#S-Ji`_niAxIQ^8YN)tqqJ!k5S_*BUFNY4F-4u9`G(W0v9;O*=f94+)C?7x
zvYptQhDL9z*Ef*V5;DWma#Kwl4duDaGW=wP;`7wCjpnvd1`SO#b!fM0%!1J-u}iOT
zS`t%%#@E|EzErxcRQ`fYJ)?gm)spx4eAd0@1P(T8Pr4n}5d$L~0>gytVD-^eF2bLx
zW3i^+7-f{_=5Zq77xY&vCpL~@OTUZ`^myD;mRijH9fO>_Qdw^gurX%)NhZcgCIxgN
z4yJcYrgaS}O8U(X^mwaTnrkxmt*ni+Cdmv>X$)_K4fl)^GtOUWQ~h>K$_^s;h!1Dw
z*q&qAD_pNCM3lb9=U3Af`-?xuwb62P12trTb=MXKaYoNRHZ<Arc>P<W%FKhkv{z#Q
zYkb(Ef5YL&$k)4*l<YqPyww#~4CnlI_TyO9-&FCzdG>DJv9*`Aw)QF0Tb@g}XFL;|
zdJF}(@<ysKnlQZ8vIbX-)Uw>e5r<wOv6-hYzI6|5@FG$$sdCQkFWT3ntQS#TJm}Ql
zMMt$vd^Dbwz3q*a30X&>%*LCQBK*U(pdQRDeKE!)FF+}k{9Fz>A6zUP@OV+3DhvOQ
zm{2a0QrQ^kn~?Df`@q(xA(yDoo!~Q+;;_*@_h(a`J~*mJkCa@npgsiRZAQ#pqSOZK
z!<aFQDccAF@7erxE_eSB4w~<=BX<^(au{b{bJJvou_BrOJoeNHZJ;l{WYV$VT*^$#
zGm{KzQ7hV6I}6XmZD3D~+7`YFF%_U1@D@G0eb!)(Ch9QYgLTW(g2JieM&KVSf!rtL
zKbg}O#<9@>muT4MNvG*<^MYIQN0h-W#UtDprj`i7Xxq=bTN{>rHH}V?ZdT~kd!O-X
zt5JI4SH&YHnn(%JNKh$z*YZsO#t%LLA680?$^5V~dE8Pl^cPrXu++@2D?!)`KkPkM
zE{Jaq+MNaAl)!{f!@ID?j@Fh)p!zU~?G%ODNge-447;DM8a%=PGRAB#D&LD5-=atG
zY9Y3SF$2Xq8v`e8Rvmy3(wxGi--=L0eqRV6KFsU+waZV(WuPT00CKK)a--{eLpmBy
zcXLs<q?~KvC^)?4Nf?`0Bj=>^*FtPQfeF;&p!YXTs3p9?U8Q0nzxqE+bM#Y7^_TmK
zsw$bo4WCokyvS6N_0(KUJ2!8X|5<gnE`*5l<#NM!+8fY7r~`)@L67`sekR&;$;h;*
zwpwsY>~{<8pDd7rDt;^sCOx&=RxoN<`o-B}EwumojPl2bzq!x}k%%W5t9nTM1xeXi
zQv;z_icyd<$#$rBJk9nk)8!h|c`$y~+NUVUGMRKk0aIBHQxP%YPu#d}ntgv1C_my;
zpbt9K?YSK7jR%!jIUz+E3dnfbRMkv&7^h$B&oh5Ae2U<xs_IiAU#Ahh5ptAiKO*rM
zI+D}YR;JsqqNkQ;tY<~#n%?y>{ka*7&~Z|XGk#69p1c_G1F<LQie0f~<Eo4Rrv-gr
z!>C{&L1hn#)ZCmqpbHXC6uk;Obwn7kSJKaZ`H?u#%dz%W!fJP&`<51T`RomXjQ_%*
zZ6iKVWhSW(o;7GYUuAwQxLzZTMt^H4@rorBp`tprXq9xsaKz)V<&_~zzsbGC#J2xC
zQqiFYS<^~7D^Pcs?HzZm78=|`Ql?|`KIZR%#&qOMAEpStCrEMl8R0iZLR|#8%!;8p
z0VGG*J(7WAxG~ij`ISsxDD--ge}1Dh3vAj>!wtQtec=#YCHNFKz$`Il6fa~c`rYYD
z(xqyH;ETfFb?fK!?^*s3`))*65xs|5*^u3Snz(6t59|0kESGze=0W7f>LL{K_sC3&
z*ardr??S+*s+p>{8sni`20|xZQ#^D^AQTjp`=*)izGeFN$qoSHK6K7(lg#A*T_gM(
zK|#q5@BmyU)j&w<hv>qjB*=s29ufgV)YL%VJRV>@1p)anJxE7WkARdZ36Lb~f2b6Q
zlm7uK{1gU}2|U1INlYN^Cl9Dh;{WL3PjQf^)PE=rpfSw?($jsQ<vQ5F*L#X)@IYS}
z;sATo(x6Sl|4@R55$t9lAPdU}snO!TA-|t0&lV5+-?zvPaJ2(gW(+`YUf(Yiz#t44
z!2F2^c+NsVJ#GM&8x&Yrr@&+WH-Eoo2Qaz=4sNUf?i>rq#T^it69uKY15Tb~K=hm}
zh{fw3iUZN>cmUlz1T^;!pw6KHjOL|4uKo}3i|5k^cjn$5g+E9&YZL(c0t7^Yyr*;k
z{39mNJB|kkA^-oNpr8j6hJ*m~3oM}A&<BbW`V0_XWC0~d{6k|S$nQ-&pl%TYI*fh@
z{9aTCr2`M}^^!bj;PV5VT#^Izf4zsyfZ$hR;M*!5;IIq<4W~ay<;x<VrK|_2l7;`^
z3amg-=K;+XbI^4Dy}=16=i>ow%Xk22_5P%a?j<^aqv(ILmiH2Q>4Owl^89`~3rMHp
zp3(w1Yh0kR@38~4fW<v(9*7;_04VS0B_6`V`uB*l1D1jPH9JuC2yi(pdVf?bpx`l}
Xd0iPaGX_wOF#=p0c#ocs{}cZodb%%W

delta 6107
zcmY+IbyU>ByT)-r6kJki5KxqsSQ->5QD8+n7Lblrq&rqbQu<4GcZbwU*DehL0!uF<
zAtALa2-nN~-E+^Kf9CT%^Pcydcg~!dGjHY)VIP{X+Mk5X+Z1~yNkl;K;}!vd91tr<
z3$)!P0ZK`15GdXAY=~6eS|ICMe*_|EtvP9boO{_-?eWIq(~Zo-^Ni?kUPq%Frv%84
zr)oV1Do+g^<-_H;g&&6jZW30jA}03FK{ok6%fnpg;T?i6z?Ni4>j&X84{fZopFMV_
zPgq3;2ochOBOr>*RYtVW6qFYa2RCa+Rij=CocWr`A#j^WVQcy=l`bl)`?rJh=2@6e
z5{>%T3cj@IohTK=HSz{HCTuU>e9Jdy(opO40;jY>4CYhDaoW$2zlNl%@5(Qiu=y0y
zcPW^JHHod;>lqb~jFKYaMy2xYMtqcZ)tr_RM@6k9lIwWE8QrU-RZ^X=V;RcRRkvfh
zd1>Ux5k>B6Zog!6HSDMhQY$F;vke(i*FG4;(;LQ}mHEaN8B^s8K(WGkdBU85Nh-nw
z3TtcD!M5Wr+_o`vA0(6W&{4w4+nrWDT<rI%A`gNL`$$kz#tt_HzI;krkI&9D>W1^{
z`epH{pQuSyb<Ueei9d7x#zhO7cL`Hs()p_IhOkx1bkuSxSs)9bbF|5@eh;j+p!qy?
z{-EaKtX!YIZYQd*W~Jk=H?Im3tB3svA-|(Mu3nBOLz<a^Zr%xT>d8I*sYD3SJ~2ag
z)Yl_lSuF&Mbw4X`D?Zu`D`om|Xx`05WdlZ9t=JoV-6wy-<e9{NDBJS-mBVV}s0ocy
zDdP2>R)lz9Vmu3c>A*fG30~0(?uQ5FkJ%zGK6$qDU~&hJ-V3Gc6s?<D-p|v!?K{su
zxy<ie#M4*xW&>!hh<bNxfV<6Da5b5Ej;hF>w*e)&1k)r=F<dJ&ix|uq`+4RjsnDFB
z&ThY0_|<Jk6XH5<Pk-wmDA-z3$n~%2AS5S8lw%`!T5$GsjQ|yRB%<maIqeC*$v4#+
z@ut*)!B7SE0vGjXi({5F1Dk|BCph*D1v<gZi2l$qI{KZ`_A~aA{AWQYl-8wXqDW8%
zb{G~KC;XlH4BS^QBKutJ$u~>nmzLWcywDn{+ksed*I9(B{*s3K(%lJ)U)|9X0a^E2
z?>RlLCvy+<B!AWWf%2&(S&4C#)QqwZi=oW4Jlwk-9?v?(Wn*DoTIX}~SZFeZY3weZ
zAHmFSz4G~ziu~mWi6715@hFzIFTs?BS|k~zo=ng{JYDEW{Wh;H5}_PGK`B?3*as<o
zcm|<4rh^YvNdzwqTykdMSQst>s4faLC0}D1!+cYzr%>h-s0|&9TBc1a9Zj|0mYS(5
zrQ~xRl7za1>q_E^{8c1q74LqFM-}HU<TuC!q6*)!mYa|Aq{`0P`Y9@%`-JGSR^{{_
z#L3^Ga@jl+&eXX=x}LGAGo)UD-l!51krEKxzD@A&0wB;O)_Fq@u#n3m9H`~)J*|5~
z+o;;B(`k5a2HVz5DDYPb6tWY9s*Q=1hza?nb`ed#_dp50Jk!HJAQQbLK*S%6B<fC3
zm!4NcT=pb4GNr{2w@;TjKlXcmFk`$!`<^dZU(Ev5Wz1Jp6W3R|xL8*md`?U42rW<Z
z?1=GR4{7rrj&Z!x3P!0QwCTWlW&T`?9^@xM7agaB;Sy8DeSyYL{QT|{1Ergd+>QKs
z-HX=BqDsXVjC!$_)l0!SF$o_V=RXM+z&V&q6#jU#AuF*Ji7|_5#Z1IhRaGYUxFADf
zpXVNXi^m<urn3ftc|YXfQxGdAT=C-fwZ#r%%w{w6J@d+2#mH3=;4eu84CNWc58s&&
z&U~|Zt)=w4`voy1-zkhUIHgdt!d&(AyoNtNOj#^^{}=Vu<JZmLF;rX_Sz6(_BApj}
zl|kX)>IuN^VZCEy?r%N`o=v9TuU`3mG^fHWsJ7ia5E@h3U;R^8nN0<6mS@yNZ|*5X
zjEnxhb4H)?Mxy|QSTBrESL0adG6`arE$lH-Quq8IpQfLyXQ6-~q4$o-rhCpAt($tI
zaQa-ZZM^S!;$?}%kABf#XFUWGO|RZjOJYN?9`~l2FNCPG(y>&9>G2l#+5fWW;j7y+
zQId*;#2h|q8>}2c^sysZFYgKl&gLAc8b;;_h%M^v5(yp^h<G##(M|65;Jh%Qs!ZR#
zZ_JpjBnDeeA_)Hffx+fQuU?Q75P04vAYi|KKTM{{5fug`p4u~Rm(e1SJ-efN!H=dL
zeHMcHwxaZb{O{irfrvkIh`dxZjmXO9v@;cXIEs`r?eB9}n2aohVtVUq>O`DU#mFTN
zZo|S}wZuF&o_J(DA!5AX>d=y}Iw7%z*yBr$?F*l*`ncP=hjAJ8zx2t%b$OWhk#*>L
zp`+b!2vJ%5!5Pm;TXyhUy>17398}g9$AA1ssrPvPv44N`QtuuEE{>Jfe<@nFgB5?k
zeEE{>t*#8BJh%#1a}!~{Tt<BPJvspgk=0!u{fi^Gl;^)HV7x^4Z2KcA5Ea2y3^=Ca
z3z+O;bo=4j-T?(1*Utk#=e&Eh(?4?{Kzxaq>S;f#A-UQO!fR1zuQA~$WHb8_sW<`I
zOQt1l>b3%|CE<Npbd*Ec3Yn;{GMNiA5u8#~n_kl{wEtceE6Zx0m3gu`UWiMl5C<(0
z>-m#+H%q)ASiMAt&ke3SnvD{cC0Ff;U-w5o;8ioQdl~qkLfEQ-TaIu~%rf%rG#UXd
z#FXb(La?+7@`V^U+FMI3**T4yDFF#ZXU;?IM6Bw#p@kx86Xq&q-1cybR(211`S}V*
znO%<4o*ixUE0Pbh+Yz&y$*tl-EYXj4#@j5-Wj6CQ7slhaV>Bq)HZf-lb{<_}t>aYl
z&=`I3F_+?^Q~lAB&dSS|O^qS%5er4X>)d^YqM{p>F_t3F+O*!(aZ;%_yJJ}DE$sT^
zD?V+F1o)k|;MJA7`df*pD~TA{i+^wLEi5h3gr(29e5~cw@g{21H}^GSsQD@#%k03a
zK9?s{<R@jP4wXcmeE9ZKlz7Q!=T%6`%KNcbg}Gr(+5YfYNX0r9nX(tZgJ>0JjBaTq
z%7|3eul{k|8$TQf8qMtCiY(ub>dVMH!d3$^aEg9r8e~r>3sXIyah&<k8xzI_aXr+0
zJlWF|m*^+3+omJ_f$>#Of9~35eqFVQ>knQg8ZBr~gYpRT*COY|<UGlS^5(vBOw-y|
zilY!0!`!eFzwzWeQTmf#h+^SLHw`oz&)}x{K_qih2iB5wbIk2SPm1Ojj8WDMLsaW)
z;Sc?`Mp6tgwuZEM_#`)HvkwNP!*f?Q{XUZxjh0g`aMCjg{Ee#pHV18TFP{&KZoR8S
znm#V`id?w!tZN>4$vZssNa2NxUeYfsm!1qND_;I$wR~eah0d%+M7?x^JA+$)Ce~Rg
zeqN7OxBK8sNnuySGL7AXp>`pLB^Uz@)H+Fq#6*xz^WQ%C8FYh2c}ibM$objs+y-d?
zrX=r$2HB8GQAT(a-w^I+Es60?fl37;e}5$RjTuFMKXp%mne_VmrD+=0@u#&VHEO>T
z0+aDh{lgzr?z>~c5JWEZg`onQ5xvC~Pg`I34~`FcnLIpC<-1wExH5^!-;y8S-GaK$
zqV%<$D)?4;qGGHu8a=-ztvXSqxh#zCt;e8A_h?gwd4CR;I%At`%CO^gi0;<cC?g|_
zOi87j$uN#@B=Mn>$9($Z`nsRqjuU6#in|WCc2vnFl7<Cn5VmcKJa=kz!nB2)Je)u4
z>_u}-ps18Z*<rHLg7zv=LH+ynjEiRMk#)3%LUt?6k8esRJujMX8|+jJn=o6Ex!<tw
z=XnbvxYD9!uSFUge;B+|k2OJZ*}_x?SG%DkZKE;9i5LM2{aTn5|Lj8_exojF{tM=3
zmamd_9+Lj_LDXnH41yS9YTh54oAQ`w{y8mM`S{38(spIzK;ur;id0@P*kQ`94jbbN
zbJq8)uQcwuq3T^Q8uxI*;bl);p0Ft@yY{4(*}^c7)IV;Mdxk+2Yo7>4Id%R4g&)zX
z=u-}T0Ym3Y-i-H&S?xF}yw?AdonDV+mwfb*odRY)h;UL3);X$Jjcc$Zn&D^A3CtT}
z(yDV3RddXi$VJUPVhedH^S0)1&)Bbgt@<Y4tl{jaV2q+I`gLJ?%*3mbB7S7JL4aO@
zJUR{{U*7Kd-UFfDWP`9}>+Paok?^h;$k*W0Cbh`vG2mpVU2}c99<lFuXZT^lM0^OI
zQatEn8}a`03xf#MFGs_J`XIbHxsaN@s?zLAj;owmexz~E_eXK#$}ZW>a5HuH!aSi!
z`nGbfL^TymSO0$QBNCccZm*uW{Nh09Z~MGCeOOU2RMqHJ-N&DuF-2n_ObxbNZG*JV
zbI(4ArNKZ@CUt-@eo_k@7Mxy(MarP*DVP^#5Z;ZCqEYjzxIeI@q|R4zFEvIRGSVU%
z$duRe?0xKK+(*?VWjN^l{Is8><r0X$GvuVeW4$_2zV@Xb6T|#?L|EK769?=?Xu>%$
zZ+M=HCS<3MQ`&8i7~}*7hNPrD|Jpj|yihO~({IdOBM?%{!ygU%^BJyBmS%6`!UkVo
zL^v<&C;4Th7tx1l!)WXNrYFSMljXe=FPsxEl#gW6l0I%9R?<>^G5~ze5H_V;gf+ny
zkoSHZ-~~LeKBBjvGOTE0$zT3w3P}2At4ce)1Y^c=mw9(lJ+3FzO|?53ToOlD?jbsQ
z5vy<+b*YLnYm1m9*uo+Hv$3$6AsTswxYOo$!QDU1@_I;r+|0PE$m%;+gL_=h`{M0G
z<%5f$DRD1rkyN$KcaWOd?Z>Vcr0Itq->o9Q2%tOr{?NT>&{g$V>kWg|J-0^vg*>mq
zXDCk~jYn^7od`Ep|5+kxII7RTuS?Tx=nETO{85~G=6slBjlci%kz`5LkHx;b8HlZh
zw*1dWnq*D}N{}lP?*^3Sl#PuDO{Q#n_};J|DU39cPe7s2pX@nCXO~n(FReYqJ3s!S
zxpR+QJYx<bXNN9azw^QC76s4j;-=+ys~q|WIf-(}MPX!T^}%7X&kOUg_?Bd$%Gg*E
z<&`g;X90@n;SqeOS93~5m%Xz)2jVxErA}mxfL*luR@v%z82Z#)1$XrodNxyEj|O?#
zTC?8y9#ue#ee40#`@N=hBOHRPaM(O&_rR8(*TW=^v|UA{N;vFIJbji@Dvqgfq))5|
zjsK+3B%G%=MK1LgBS8tMi(6<ytCMv7`XYUFu6pK_!`D7fr8S$oHu{36h<K7;VZuUB
zPGj>y(_V`@?XTfn8#(w-Z6!{lnk#x%5?42|OsX85_8tK`R_Ov3I#G8T%~|m5^dSLk
z=E+zY@@x=EdFQ?R+(^!|Odf9!syD1W>9@W&hWlp@K0RyhEXqPgul#0a-Iymp?(Z8+
zedpt^fW(v;4&6<y`DAfN4N<=evVj`BkO?a~+G8uLe=rUyD3u?LuT`m7-AoT>%_BXA
z4ML%iVq3UBLjtrypnLM(5fbb$$>*yu%nuPX34Rq^>h*W~m(1Af3XeCtwBOBnb(dcg
z+c1f(KCz$tT8{k$O(PYvpV-y?HCzAn)o{Gqea*A+gt|&S*q!p*I7C$ro)~UpMuq~z
zD|2*bHB0PErq1`Q`F1;<cfPk&?6jrteo56!1aN;nIdv@aU?t+y4VG_`<o?z?Uf-(q
zVy$!b(AfQ(E}Oj`Tni(8HnnnVKhRK*#s9YKP=;(*b4a{J`dc(_S$T;1)#~`*XeGJB
zp(v5C{^CknZ+MPDIf6NNHJG7%iv%yMzp!ElC-=6dv>cdmrI%ATwI3T;F3jc(Op`_q
zG9GZ(b!$5`zCYFbU0gY*arcOL7%Z<aU&fOe;zHJFU43a#?n}Z1YP70$qD>11HI8N<
zcq<&EOTU~%Z3Q#_Ew?K+2p9%*Mv-*1Nf&fk%@LxhKX;1l5O|Iu>j}ovw{mq96>@dX
zRyxG|0z=<IR1*TG!E>J$nFIqD!E-Q&?67!glaAo1mOtCUh7{Ar?dWVzC&DU-cGcQD
zd<t|u+MKZeo6(YT6d~9rxxhW<ky~i*;_w6MA)?c4pn$56>Zs=K!wc!qJbJ4aoRX@L
zBRa?Q9N7R5#0tl=(2)H*61@~nW?QcNN)aonJBtDj!>d+B8l-Vjc1vu()AGLsOg;z=
z3z>Lgn+88SWz5<$r*2$j5F6$glpX51lvo`8<C)yL)cvd~_o+?u<?VS$*T@yg1xKmf
z_&xvdI!13N7THJ}ow9K8xAN)hDxr1nNpxO5da`Eoh8s~DQ!9<M#2FxyG&FiI3~(D<
zO?@3wgfOs-&9WEa9%SF2kX2C7R#0p;CsR`73F=YmJB4m$vSa?A4~2)vQ{rg2TIg}h
z%;#nP<0_XF3=%`*8MV$|@IBh?=L2pRYvA0jplO5m3~;n*nPU?mJCAdrLwr57=?Cw&
zO+5V)g~;g``N@FsF%~xsU3O6?;ZOsd$+t<wc%sSfAu~Vt(+k*M>iT|m8vPVVVa|jx
z&hfX2>kf%tAM?<=>xP+`#7lZs61$5|7J_%%!KyPj!t#T}j$H#+@?leTQwL&WsN$BN
zuXS}6RGLD|V8HiN%M-zT^@+Hmns8IP+?%IVh@_upzIr!I+-a7r=-%NBXw*Op0`LK3
zG5fdG`C@Axy?d+8VQLq(qkUTD+FNVrN5Q|J6R&jh2Lv)Ole+5pGloEZZQ79>m7YGM
zSPJ1GRDQtW?r9jb{g**e3Mr>PHrRWagZ|ku4kjL;JOdL~Id05<AIX`>kc*CA+ui@=
zieS-e>hskR-1I9Sx7b<Y{B>4i6p>2LP#vgtG6;8vGL>E3$NPQ$J2r~XGQDNg;Sw=&
zC}lz+3@Sq%I2q-97R&9|8Ij2^?^DGQK_oiqZS2$!-rzVqn=~d~TS{n&I+svxt4dWO
zT?K0)JEx>9E7saW8h!<pX6{40rAN`jh#GI1o75z!X#Og5F+Eh$Sz%oBBgaoRGb<f|
z%sz%6mT5sNb4K6xv74oP1Iw20zM524x7=^hEKVl&`{*A^av^As2>5+MmAkC`g~v*@
z6VKn0>eZdon>BH(O$mACnxk3D?vSlCFFnvZ<M`BOL$6qo<|nFy+wcdAr#|c*FXA0x
zH?y=%0M+q6@r$W$I>#+&hUs)Wr!aP<n~A|ZMKRb{ZX_aGK-f}DIe5#DpE+WBKs3VG
zz|qMw*4;my)?{UPgU3NbpytlAfcX^G_4$BuImsno@Q#hEHQ(day17Pz(ZIJ8Z8yCP
zFKXK)KL1c^?@CE>{<@|oc^G>bJk59^xhmz!RA%|K_$o)V`D@gVs>@bSmXVID_PQXp
znfja8U01+t3V!o{8ZKi~G@#q$KrAH-Ks3$G{Qo}H|N1ijJMsgZDgOmM1O$Fi0>0CX
zpbAzXhYbP@PV;~=*nn7eQGjoT2b9nGFNg-PpHT$a@?7J<j2uW$<Qmz2NP^@<uhH=z
z&OE)wjvtDk%;(p*{OlG`DMt)&&GLW{I@gxntQd$_AIO=t1d$v5n;rn%bAq5Sv;WC5
zrwmH5zQ&O`MNqumfAAI{I4=R(a|Yn^>L7I&pmkmcl<WdfW28a-E`U157^La`Z(;!6
zdT;>S7#<Lz58zb83_up-Kq<c0h{3P|H4BWOGrwzz9|QyQvy{NiMMjY9XMlZC`vwod
zw#WgbE-HdXLjM^Lf%PzIAY_ITD2kv2|KGNCegWi`Y(aD}*D)hY>Y#zRYg_`D0h47O
z&|%88tXNh8{Yk$@@*HA-B9r#tDkY$>!U#Ie`j1TupjRn@;(ykyyld-zJ{@qm!UG~I
zxR#ZxV8CEi5JXV?ANc~bS9*;MYtkTvifc5iynmg!XpIr%SN*R#E?|3&2Q<?K40dw?
zvREDv77e_^>Vs~N02d=N!1;GdfNGr)gc$|K#-y*M=Ra9B4#cmk-naoQuS*cWnE3C4
F{|nTN-B$nr

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4b4429..1db799f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7..fbd7c51 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 62bd9b9..5093609 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

From 34636ea9f95009793a5035bdc78fc88774cdc735 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 27 Apr 2020 23:18:30 -0700
Subject: [PATCH 042/262] Added ChannelFeed command.

---
 .../net/thauvin/erik/mobibot/FeedReader.java  |   4 +-
 .../net/thauvin/erik/mobibot/Mobibot.java     | 116 ++++++------------
 .../erik/mobibot/commands/ChannelFeed.kt      |  64 ++++++++++
 3 files changed, 103 insertions(+), 81 deletions(-)
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt

diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
index d140105..cac105e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
@@ -48,7 +48,7 @@ import java.util.List;
  * @created Feb 1, 2004
  * @since 1.0
  */
-class FeedReader implements Runnable {
+public class FeedReader implements Runnable {
     // Maximum number of feed items to display
     private static final int MAX_ITEMS = 5;
 
@@ -68,7 +68,7 @@ class FeedReader implements Runnable {
      * @param sender The nick of the person who sent the message.
      * @param url    The URL to fetch.
      */
-    FeedReader(final Mobibot bot, final String sender, final String url) {
+    public FeedReader(final Mobibot bot, final String sender, final String url) {
         this.bot = bot;
         this.sender = sender;
         this.url = url;
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index bc94f0c..fdca6d2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -168,8 +168,6 @@ public class Mobibot extends PircBot {
     private final Twitter twitterModule;
     // Backlogs URL
     private String backLogsUrl = "";
-    // Feed URL
-    private String feedUrl = "";
     // Ident message
     private String identMsg = "";
     // Ident nick
@@ -229,41 +227,41 @@ public class Mobibot extends PircBot {
 
         // Set the URLs
         setWeblogUrl(getVersion());
-        setFeedUrl(p.getProperty("feed", ""));
         setBacklogsUrl(Utils.ensureDir(p.getProperty("backlogs", weblogUrl), true));
 
         // Set the pinboard authentication
         setPinboardAuth(p.getProperty("pinboard-api-token"));
 
-        // Set the ignored nicks
-        ignoreCommand = new Ignore(p.getProperty("ignore", ""));
-
         // Load the commands
-        commands.add(new AddLog());
-        commands.add(new Cycle());
-        commands.add(ignoreCommand);
-        commands.add(new Info());
-        commands.add(new Me());
-        commands.add(new Modules());
-        commands.add(new Msg());
-        commands.add(new Nick());
-        commands.add(new Recap());
-        commands.add(new Say());
-        commands.add(new Users());
-        commands.add(new Versions());
+        addCommand(new AddLog());
+        addCommand(new ChannelFeed(getChannelName(), p.getProperty("feed", "")));
+        addCommand(new Cycle());
+        addCommand(new Info());
+        addCommand(new Me());
+        addCommand(new Modules());
+        addCommand(new Msg());
+        addCommand(new Nick());
+        addCommand(new Recap());
+        addCommand(new Say());
+        addCommand(new Users());
+        addCommand(new Versions());
 
-        // Tell
+        // Ignore command
+        ignoreCommand = new Ignore(p.getProperty("ignore", ""));
+        addCommand(ignoreCommand);
+
+        // Tell command
         tell = new Tell(this, p.getProperty("tell-max-days"), p.getProperty("tell-max-size"));
         if (tell.isEnabled()) {
-            commands.add(tell);
+            addCommand(tell);
         }
 
         // Load the links commands
-        commands.add(new Comment());
-        commands.add(new Posting());
-        commands.add(new Tags());
-        commands.add(new UrlMgr(p.getProperty("tags", ""), p.getProperty("tags-keywords", "")));
-        commands.add(new View());
+        addCommand(new Comment());
+        addCommand(new Posting());
+        addCommand(new Tags());
+        addCommand(new UrlMgr(p.getProperty("tags", ""), p.getProperty("tags-keywords", "")));
+        addCommand(new View());
 
         // Load the modules
         addModule(new Calc());
@@ -485,19 +483,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Responds with the title and links from the RSS feed.
-     *
-     * @param sender The nick of the person who sent the message.
-     */
-    private void feedResponse(final String sender) {
-        if (isNotBlank(feedUrl)) {
-            new Thread(new FeedReader(this, sender, feedUrl)).start();
-        } else {
-            send(sender, "There is no feed setup for this channel.", false);
-        }
-    }
-
     /**
      * Returns the backlogs URL.
      *
@@ -696,15 +681,9 @@ public class Mobibot extends PircBot {
         if (StringUtils.isBlank(topic)) {
             helpDefault(sender, isOp, isPrivate);
         } else {
-            final String lcTopic = lowerCase(topic).trim();
-            if (lcTopic.equals(getChannelName())) {
-                send(sender, "To list the last 5 posts from the channel's weblog:", isPrivate);
-                send(sender, Utils.helpIndent(getNick() + ": " + getChannelName()), isPrivate);
-            } else {
-                // Command, Modules or Default
-                if (!helpCommands(sender, topic, isPrivate) && !helpModules(sender, lcTopic, isPrivate)) {
-                    helpDefault(sender, isOp, isPrivate);
-                }
+            // Command, Modules or Default
+            if (!helpCommands(sender, topic, isPrivate) && !helpModules(sender, lowerCase(topic).trim(), isPrivate)) {
+                helpDefault(sender, isOp, isPrivate);
             }
         }
     }
@@ -790,47 +769,35 @@ public class Mobibot extends PircBot {
 
             if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
                 helpResponse(sender, args, false);
-            } else if (cmd.equalsIgnoreCase(getChannelName())) { // mobibot: <channel>
-                feedResponse(sender);
             } else {
-                boolean skip = false;
                 // Commands
                 for (final AbstractCommand command : commands) {
                     if (command.isPublic() && command.getCommand().startsWith(cmd)) {
                         command.commandResponse(this, sender, login, args, isOp(sender), false);
-                        skip = true;
-                        break;
+                        return;
                     }
                 }
-                if (!skip) {
-                    // Modules
-                    for (final AbstractModule module : modules) { // modules
-                        for (final String c : module.getCommands()) {
-                            if (cmd.startsWith(c)) {
-                                module.commandResponse(this, sender, cmd, args, false);
-                                break;
-                            }
+                // Modules
+                for (final AbstractModule module : modules) { // modules
+                    for (final String c : module.getCommands()) {
+                        if (cmd.startsWith(c)) {
+                            module.commandResponse(this, sender, cmd, args, false);
+                            return;
                         }
                     }
                 }
             }
-        } else { // Commands
+        } else {
+            // Commands, e.g.: https://www.example.com/
             for (final AbstractCommand command : commands) {
                 if (command.matches(message)) {
                     command.commandResponse(this, sender, login, message, isOp(sender), false);
-                    isCommand = true;
-                    break;
+                    return;
                 }
             }
         }
 
-        if (!isCommand) {
-            Recap.storeRecap(sender, message, false);
-        }
-
-        if (tell.isEnabled()) {
-            tell.send(sender, true);
-        }
+        Recap.storeRecap(sender, message, false);
     }
 
     /**
@@ -1014,15 +981,6 @@ public class Mobibot extends PircBot {
         backLogsUrl = url;
     }
 
-    /**
-     * Sets the feed URL.
-     *
-     * @param feedUrl The feed URL.
-     */
-    final void setFeedUrl(final String feedUrl) {
-        this.feedUrl = feedUrl;
-    }
-
     /**
      * Sets the bot's identification.
      *
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
new file mode 100644
index 0000000..a5ce92a
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -0,0 +1,64 @@
+/*
+ * Feed.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.FeedReader
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import org.apache.commons.lang3.StringUtils.isNotBlank
+
+class ChannelFeed(channel: String, private val feedUrl: String) : AbstractCommand() {
+    override val command = channel
+    override val help = listOf(
+        "To list the last 5 posts from the channel's weblog feed:",
+        Utils.helpIndent("%c $channel")
+    )
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        bot: Mobibot,
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isNotBlank(feedUrl)) {
+            Thread(FeedReader(bot, sender, feedUrl)).start()
+        } else {
+            bot.send(sender, "There is no feed setup for this channel.", false)
+        }
+    }
+}

From aba2633dc469ed1206f2aeef95e07ff4eb9a7c09 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 27 Apr 2020 23:19:16 -0700
Subject: [PATCH 043/262] Cleanup.

---
 .../net/thauvin/erik/mobibot/Constants.java   |   8 +
 .../net/thauvin/erik/mobibot/Mobibot.java     | 153 ++++++++----------
 .../erik/mobibot/commands/links/UrlMgr.kt     |   3 +-
 .../erik/mobibot/commands/tell/Tell.java      |   5 +-
 .../commands/tell/TellMessagesMgr.java        |   9 +-
 .../erik/mobibot/entries/EntriesMgr.java      |  69 ++++----
 .../thauvin/erik/mobibot/modules/Lookup.java  |   5 +-
 .../mobibot/modules/GoogleSearchTest.java     |   4 +-
 .../mobibot/modules/RockPaperScissorsTest.kt  |  21 ++-
 .../erik/mobibot/modules/StockQuoteTest.java  |   2 +-
 .../erik/mobibot/modules/TwitterTest.java     |  16 +-
 .../erik/mobibot/modules/Weather2Test.java    |  14 +-
 12 files changed, 145 insertions(+), 164 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.java b/src/main/java/net/thauvin/erik/mobibot/Constants.java
index 9943398..eaf8d2d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.java
@@ -54,6 +54,14 @@ public final class Constants {
      * The debug command.
      */
     public static final String DEBUG_CMD = "debug";
+    /**
+     * Default IRC Port.
+     */
+    public static final int DEFAULT_PORT = 6667;
+    /**
+     * Default IRC Server.
+     */
+    public static final String DEFAULT_SERVER = "irc.freenode.net";
     /**
      * The die command.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index fdca6d2..affe915 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -35,6 +35,7 @@ package net.thauvin.erik.mobibot;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.thauvin.erik.mobibot.commands.AbstractCommand;
 import net.thauvin.erik.mobibot.commands.AddLog;
+import net.thauvin.erik.mobibot.commands.ChannelFeed;
 import net.thauvin.erik.mobibot.commands.Cycle;
 import net.thauvin.erik.mobibot.commands.Ignore;
 import net.thauvin.erik.mobibot.commands.Info;
@@ -122,16 +123,12 @@ public class Mobibot extends PircBot {
                     ReleaseInfo.PROJECT + " v" + ReleaseInfo.VERSION
                     + " (" + Utils.green("https://www.mobitopia.org/mobibot/") + ')',
                     "Written by Erik C. Thauvin (" + Utils.green("https://erik.thauvin.net/") + ')');
-    // Timer
-    public static final Timer timer = new Timer(true);
-    // Default port
-    private static final int DEFAULT_PORT = 6667;
-    // Default server
-    private static final String DEFAULT_SERVER = "irc.freenode.net";
+    // Logger
+    private static final Logger LOGGER = LogManager.getLogger(Mobibot.class);
     // Maximum number of times the bot will try to reconnect, if disconnected
     private static final int MAX_RECONNECT = 10;
-    // Logger
-    private static final Logger logger = LogManager.getLogger(Mobibot.class);
+    // Timer
+    private static final Timer TIMER = new Timer(true);
     // Ignore command
     public final Ignore ignoreCommand;
     // Automatically post links to Twitter
@@ -179,6 +176,7 @@ public class Mobibot extends PircBot {
     // Weblog URL
     private String weblogUrl = "";
 
+
     /**
      * Creates a new {@link Mobibot} instance.
      *
@@ -196,25 +194,20 @@ public class Mobibot extends PircBot {
 
         setName(nickname);
 
-        ircServer = p.getProperty("server", DEFAULT_SERVER);
-        ircPort = Utils.getIntProperty(p.getProperty("port"), DEFAULT_PORT);
+        ircServer = p.getProperty("server", Constants.DEFAULT_SERVER);
+        ircPort = Utils.getIntProperty(p.getProperty("port"), Constants.DEFAULT_PORT);
         ircChannel = channel;
         logsDir = logsDirPath;
 
         // Set the logger level
-        loggerLevel = logger.getLevel();
+        loggerLevel = LOGGER.getLevel();
 
         // Load the current entries and backlogs, if any
         try {
             UrlMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, ircChannel);
-
-            if (logger.isDebugEnabled()) {
-                logger.debug("Last feed: {}", UrlMgr.getStartDate());
-            }
+            LOGGER.debug("Last feed: {}", UrlMgr.getStartDate());
         } catch (Exception e) {
-            if (logger.isErrorEnabled()) {
-                logger.error("An error occurred while loading the logs.", e);
-            }
+            LOGGER.error("An error occurred while loading the logs.", e);
         }
 
         // Initialize the bot
@@ -273,15 +266,14 @@ public class Mobibot extends PircBot {
         addModule(new Ping());
         addModule(new RockPaperScissors());
         addModule(new StockQuote());
-
-        // Twitter
-        twitterModule = new Twitter();
-        addModule(twitterModule);
-
         addModule(new War());
         addModule(new Weather2());
         addModule(new WorldTime());
 
+        // Twitter module
+        twitterModule = new Twitter();
+        addModule(twitterModule);
+
         // Load the modules properties
         modules.stream().filter(AbstractModule::hasProperties).forEach(module -> {
             for (final String s : module.getPropertyKeys()) {
@@ -295,6 +287,11 @@ public class Mobibot extends PircBot {
                 Boolean.parseBoolean(p.getProperty(Constants.TWITTER_AUTOPOST_PROP, "false"))
                 && twitterModule.isEnabled();
 
+        // Sort the command & module names
+        Collections.sort(commandsNames);
+        Collections.sort(opsCommandsNames);
+        Collections.sort(modulesNames);
+
         // Save the entries
         UrlMgr.saveEntries(this, true);
     }
@@ -418,6 +415,22 @@ public class Mobibot extends PircBot {
         }
     }
 
+    /**
+     * Adds a command.
+     *
+     * @param command The command to add.
+     */
+    private void addCommand(final AbstractCommand command) {
+        commands.add(command);
+        if (command.isVisible()) {
+            if (command.isOp()) {
+                opsCommandsNames.add(command.getCommand());
+            } else {
+                commandsNames.add(command.getCommand());
+            }
+        }
+    }
+
     /**
      * Adds a module.
      *
@@ -426,6 +439,7 @@ public class Mobibot extends PircBot {
     private void addModule(final AbstractModule module) {
         modules.add(module);
         modulesNames.add(module.getClass().getSimpleName());
+        commandsNames.addAll(module.getCommands());
     }
 
     /**
@@ -456,11 +470,7 @@ public class Mobibot extends PircBot {
                     connect(ircServer, ircPort);
                 } catch (Exception ex) {
                     if (retries == MAX_RECONNECT) {
-                        if (logger.isDebugEnabled()) {
-                            logger.debug(
-                                    "Unable to reconnect to {} after {} retries.", ircServer, MAX_RECONNECT, ex);
-                        }
-
+                        LOGGER.debug("Unable to reconnect to {} after {} retries.", ircServer, MAX_RECONNECT, ex);
                         e.printStackTrace(System.err);
                         System.exit(1);
                     }
@@ -526,7 +536,7 @@ public class Mobibot extends PircBot {
      * @return The bot's logger.
      */
     public final Logger getLogger() {
-        return logger;
+        return LOGGER;
     }
 
     /**
@@ -567,6 +577,15 @@ public class Mobibot extends PircBot {
         return buff.toString();
     }
 
+    /**
+     * Returns the bot's timer.
+     *
+     * @return The timer.
+     */
+    public final Timer getTimer() {
+        return TIMER;
+    }
+
     /**
      * Get today's date for the feed.
      *
@@ -616,30 +635,6 @@ public class Mobibot extends PircBot {
              Utils.helpIndent(Utils.helpFormat("%c " + Constants.HELP_CMD + " <command>", getNick(), isPrivate)),
              isPrivate);
         send(sender, "The commands are:", isPrivate);
-
-        if (commandsNames.isEmpty()) {
-            // Feed command
-            commandsNames.add(getChannelName());
-
-            // Commands
-            for (final AbstractCommand command : commands) {
-                if (command.isVisible()) {
-                    if (command.isOp()) {
-                        opsCommandsNames.add(command.getCommand());
-                    } else {
-                        commandsNames.add(command.getCommand());
-                    }
-                }
-            }
-
-            // Modules commands
-            modules.stream().filter(AbstractModule::isEnabled)
-                   .forEach(module -> commandsNames.addAll(module.getCommands()));
-
-            Collections.sort(commandsNames);
-            Collections.sort(opsCommandsNames);
-        }
-
         sendList(sender, commandsNames, 8, isPrivate, true);
         if (isOp) {
             send(sender, "The op commands are:", isPrivate);
@@ -749,15 +744,13 @@ public class Mobibot extends PircBot {
     @Override
     protected final void onMessage(final String channel, final String sender, final String login, final String hostname,
                                    final String message) {
-        if (logger.isDebugEnabled()) {
-            logger.debug(">>> {} : {}", sender, message);
+        LOGGER.debug(">>> {} : {}", sender, message);
+
+        if (tell.isEnabled()) {
+            tell.send(sender, true);
         }
 
-        boolean isCommand = false;
-
         if (message.matches(getNickPattern() + ":.*")) { // mobibot: <command>
-            isCommand = true;
-
             final String[] cmds = message.substring(message.indexOf(':') + 1).trim().split(" ", 2);
             final String cmd = lowerCase(cmds[0]);
 
@@ -808,9 +801,7 @@ public class Mobibot extends PircBot {
     @Override
     protected final void onPrivateMessage(final String sender, final String login, final String hostname,
                                           final String message) {
-        if (logger.isDebugEnabled()) {
-            logger.debug(">>> {} : {}", sender, message);
-        }
+        LOGGER.debug(">>> {} : {}", sender, message);
 
         final String[] cmds = message.split(" ", 2);
         final String cmd = lowerCase(cmds[0]);
@@ -828,15 +819,15 @@ public class Mobibot extends PircBot {
             sendRawLine("QUIT : Poof!");
             System.exit(0);
         } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) { // debug
-            if (logger.isDebugEnabled()) {
-                Configurator.setLevel(logger.getName(), loggerLevel);
+            if (LOGGER.isDebugEnabled()) {
+                Configurator.setLevel(LOGGER.getName(), loggerLevel);
             } else {
-                Configurator.setLevel(logger.getName(), Level.DEBUG);
+                Configurator.setLevel(LOGGER.getName(), Level.DEBUG);
             }
-            send(sender, "Debug logging is " + (logger.isDebugEnabled() ? "enabled." : "disabled."), true);
+            send(sender, "Debug logging is " + (LOGGER.isDebugEnabled() ? "enabled." : "disabled."), true);
         } else if (isOp && Constants.DIE_CMD.equals(cmd)) { // die
             send(sender + " has just signed my death sentence.");
-            timer.cancel();
+            TIMER.cancel();
             twitterShutdown();
             twitterNotification("killed by  " + sender + " on " + ircChannel);
             sleep(3);
@@ -869,7 +860,7 @@ public class Mobibot extends PircBot {
     @Override
     protected final void onAction(final String sender, final String login, final String hostname, final String target,
                                   final String action) {
-        if (target != null && target.equals(ircChannel)) {
+        if (ircChannel.equals(target)) {
             Recap.storeRecap(sender, action, true);
         }
     }
@@ -905,16 +896,10 @@ public class Mobibot extends PircBot {
     public final void send(final String sender, final String message, final boolean isPrivate) {
         if (isNotBlank(message) && isNotBlank(sender)) {
             if (isPrivate) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Sending message to {} : {}", sender, message);
-                }
-
+                LOGGER.debug("Sending message to {} : {}", sender, message);
                 sendMessage(sender, message);
             } else {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Sending notice to {} : {}", sender, message);
-                }
-
+                LOGGER.debug("Sending notice to {} : {}", sender, message);
                 sendNotice(sender, message);
             }
         }
@@ -1028,7 +1013,7 @@ public class Mobibot extends PircBot {
     }
 
     /**
-     * Add an entry to be posted on twitter.
+     * Add an entry to be posted on Twitter.
      *
      * @param index The entry index.
      */
@@ -1049,11 +1034,12 @@ public class Mobibot extends PircBot {
                     entry.getTitle() + ' ' + entry.getLink() + " via " + entry.getNick() + " on " + getChannel();
             new Thread(() -> {
                 try {
+                    if (LOGGER.isDebugEnabled()) {
+                        LOGGER.debug("Posting {}{} to Twitter.", Constants.LINK_CMD, index + 1);
+                    }
                     twitterModule.post(twitterHandle, msg, false);
                 } catch (ModuleException e) {
-                    if (logger.isWarnEnabled()) {
-                        logger.warn("Failed to post entry on twitter.", e);
-                    }
+                    LOGGER.warn("Failed to post entry on Twitter.", e);
                 }
             }).start();
             twitterEntries.remove(index);
@@ -1083,16 +1069,14 @@ public class Mobibot extends PircBot {
                             getName() + ' ' + ReleaseInfo.VERSION + " " + msg,
                             true);
                 } catch (ModuleException e) {
-                    if (logger.isWarnEnabled()) {
-                        logger.warn("Failed to notify @{}: {}", twitterHandle, msg, e);
-                    }
+                    LOGGER.warn("Failed to notify @{}: {}", twitterHandle, msg, e);
                 }
             }).start();
         }
     }
 
     /**
-     * Removes entry from twitter auto-post.
+     * Removes entry from Twitter auto-post.
      *
      * @param index The entry's index.
      */
@@ -1106,6 +1090,7 @@ public class Mobibot extends PircBot {
      */
     final void twitterShutdown() {
         if (twitterModule.isEnabled() && isNotBlank(twitterHandle)) {
+            LOGGER.debug("Twitter shutdown.");
             for (final int i : twitterEntries) {
                 twitterEntryPost(i);
             }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
index 1a6cd77..539094f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -237,7 +237,8 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
     private fun twitterPost(bot: Mobibot, index: Int) {
         if (bot.isTwitterAutoPost) {
             bot.twitterAddEntry(index)
-            Mobibot.timer.schedule(TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L)
+            bot.logger.debug("Scheduling ${Constants.LINK_CMD}${index + 1} for posting on Twitter.")
+            bot.timer.schedule(TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index ff626cb..fe96e9d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -106,10 +106,7 @@ public class Tell extends AbstractCommand {
      */
     @SuppressWarnings("WeakerAccess")
     final boolean clean() {
-        if (bot.getLogger().isDebugEnabled()) {
-            bot.getLogger().debug("Cleaning the messages.");
-        }
-
+        bot.getLogger().debug("Cleaning the messages.");
         return TellMessagesMgr.clean(messages, maxDays);
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
index e4050f7..b712438 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
@@ -91,9 +91,7 @@ final class TellMessagesMgr {
         try {
             try (final ObjectInput input = new ObjectInputStream(
                 new BufferedInputStream(Files.newInputStream(Paths.get(file))))) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Loading the messages.");
-                }
+                logger.debug("Loading the messages.");
 
                 return ((List<TellMessage>) input.readObject());
             }
@@ -117,10 +115,7 @@ final class TellMessagesMgr {
         try {
             try (final ObjectOutput output = new ObjectOutputStream(
                 new BufferedOutputStream(Files.newOutputStream(Paths.get(file))))) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Saving the messages.");
-                }
-
+                logger.debug("Saving the messages.");
                 output.writeObject(messages);
             }
         } catch (IOException e) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java
index d1ba70b..42c1fb9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java
@@ -102,13 +102,13 @@ public final class EntriesMgr {
      * @throws FeedException If an error occurred while reading the feed.
      */
     public static void loadBacklogs(final String file, final Collection<String> history)
-        throws IOException, FeedException {
+            throws IOException, FeedException {
         history.clear();
 
         final SyndFeedInput input = new SyndFeedInput();
 
         try (final InputStreamReader reader =
-                 new InputStreamReader(Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8)) {
+                     new InputStreamReader(Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8)) {
 
             final SyndFeed feed = input.build(reader);
 
@@ -134,7 +134,7 @@ public final class EntriesMgr {
      */
     @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     public static String loadEntries(final String file, final String channel, final Collection<EntryLink> entries)
-        throws IOException, FeedException {
+            throws IOException, FeedException {
         entries.clear();
 
         final SyndFeedInput input = new SyndFeedInput();
@@ -142,7 +142,7 @@ public final class EntriesMgr {
         final String today;
 
         try (final InputStreamReader reader = new InputStreamReader(
-            Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8)) {
+                Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8)) {
             final SyndFeed feed = input.build(reader);
 
             today = Utils.isoLocalDate(feed.getPublishedDate());
@@ -157,13 +157,13 @@ public final class EntriesMgr {
             for (int i = items.size() - 1; i >= 0; i--) {
                 item = items.get(i);
                 author = item.getAuthor()
-                    .substring(item.getAuthor().lastIndexOf('(') + 1, item.getAuthor().length() - 1);
+                             .substring(item.getAuthor().lastIndexOf('(') + 1, item.getAuthor().length() - 1);
                 entry = new EntryLink(item.getLink(),
-                    item.getTitle(),
-                    author,
-                    channel,
-                    item.getPublishedDate(),
-                    item.getCategories());
+                                      item.getTitle(),
+                                      author,
+                                      channel,
+                                      item.getPublishedDate(),
+                                      item.getCategories());
                 description = item.getDescription();
                 comments = description.getValue().split("<br/>");
 
@@ -191,15 +191,14 @@ public final class EntriesMgr {
      * @param history     The history array.
      * @param isDayBackup Set the true if the daily backup file should also be created.
      */
-    @SuppressFBWarnings(value = {"CE_CLASS_ENVY", "CC_CYCLOMATIC_COMPLEXITY"}, justification = "Yes, it does.")
+    @SuppressFBWarnings(value = { "CE_CLASS_ENVY", "CC_CYCLOMATIC_COMPLEXITY" },
+                        justification = "Yes, it does.")
     @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
     public static void saveEntries(final Mobibot bot,
                                    final List<EntryLink> entries,
                                    final List<String> history,
                                    final boolean isDayBackup) {
-        if (bot.getLogger().isDebugEnabled()) {
-            bot.getLogger().debug("Saving the feeds...");
-        }
+        bot.getLogger().debug("Saving the feeds...");
 
         if (StringUtils.isNotBlank(bot.getLogsDir()) && StringUtils.isNotBlank(bot.getWeblogUrl())) {
             try {
@@ -209,7 +208,7 @@ public final class EntriesMgr {
                 SyndEntry item;
                 SyndContent description;
                 try (final Writer fw = new OutputStreamWriter(
-                    Files.newOutputStream(Paths.get(bot.getLogsDir() + CURRENT_XML)), StandardCharsets.UTF_8)) {
+                        Files.newOutputStream(Paths.get(bot.getLogsDir() + CURRENT_XML)), StandardCharsets.UTF_8)) {
                     rss.setFeedType("rss_2.0");
                     rss.setTitle(bot.getChannel() + " IRC Links");
                     rss.setDescription("Links from " + bot.getIrcServer() + " on " + bot.getChannel());
@@ -225,14 +224,14 @@ public final class EntriesMgr {
                         entry = entries.get(i);
 
                         buff = new StringBuilder()
-                            .append("Posted by <b>")
-                            .append(entry.getNick())
-                            .append("</b> on <a href=\"irc://")
-                            .append(bot.getIrcServer()).append('/')
-                            .append(entry.getChannel())
-                            .append("\"><b>")
-                            .append(entry.getChannel())
-                            .append("</b></a>");
+                                       .append("Posted by <b>")
+                                       .append(entry.getNick())
+                                       .append("</b> on <a href=\"irc://")
+                                       .append(bot.getIrcServer()).append('/')
+                                       .append(entry.getChannel())
+                                       .append("\"><b>")
+                                       .append(entry.getChannel())
+                                       .append("</b></a>");
 
                         if (entry.getCommentsCount() > 0) {
                             buff.append(" <br/><br/>");
@@ -258,7 +257,8 @@ public final class EntriesMgr {
                         item.setTitle(entry.getTitle());
                         item.setPublishedDate(entry.getDate());
                         item.setAuthor(
-                            bot.getChannel().substring(1) + '@' + bot.getIrcServer() + " (" + entry.getNick() + ')');
+                                bot.getChannel().substring(1) + '@' + bot.getIrcServer() + " (" + entry.getNick()
+                                + ')');
                         item.setCategories(entry.getTags());
 
                         items.add(item);
@@ -266,16 +266,13 @@ public final class EntriesMgr {
 
                     rss.setEntries(items);
 
-                    if (bot.getLogger().isDebugEnabled()) {
-                        bot.getLogger().debug("Writing the entries feed.");
-                    }
-
+                    bot.getLogger().debug("Writing the entries feed.");
                     output.output(rss, fw);
                 }
 
                 try (final Writer fw = new OutputStreamWriter(
-                    Files.newOutputStream(Paths.get(
-                        bot.getLogsDir() + bot.getToday() + XML_EXT)), StandardCharsets.UTF_8)) {
+                        Files.newOutputStream(Paths.get(
+                                bot.getLogsDir() + bot.getToday() + XML_EXT)), StandardCharsets.UTF_8)) {
                     output.output(rss, fw);
                 }
 
@@ -290,12 +287,12 @@ public final class EntriesMgr {
                         }
 
                         try (final Writer fw = new OutputStreamWriter(
-                            Files.newOutputStream(Paths.get(bot.getLogsDir() + NAV_XML)), StandardCharsets.UTF_8)) {
+                                Files.newOutputStream(Paths.get(bot.getLogsDir() + NAV_XML)), StandardCharsets.UTF_8)) {
                             rss = new SyndFeedImpl();
                             rss.setFeedType("rss_2.0");
                             rss.setTitle(bot.getChannel() + " IRC Links Backlogs");
                             rss.setDescription("Backlogs of Links from " + bot.getIrcServer() + " on "
-                                + bot.getChannel());
+                                               + bot.getChannel());
                             rss.setLink(bot.getBacklogsUrl());
                             rss.setPublishedDate(Calendar.getInstance().getTime());
 
@@ -317,10 +314,7 @@ public final class EntriesMgr {
 
                             rss.setEntries(items);
 
-                            if (bot.getLogger().isDebugEnabled()) {
-                                bot.getLogger().debug("Writing the backlog feed.");
-                            }
-
+                            bot.getLogger().debug("Writing the backlog feed.");
                             output.output(rss, fw);
                         }
                     } else {
@@ -331,8 +325,7 @@ public final class EntriesMgr {
                 bot.getLogger().warn("Unable to generate the entries feed.", e);
             }
         } else {
-            bot.getLogger()
-                .warn("Unable to generate the entries feed. At least one of the required property is missing.");
+            bot.getLogger().warn("Unable to generate the entries feed. A required property is missing.");
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
index 20ab522..a065068 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
@@ -180,10 +180,7 @@ public final class Lookup extends AbstractModule {
                             bot.send("Unknown host.");
                         }
                     } catch (IOException ioe) {
-                        if (bot.getLogger().isDebugEnabled()) {
-                            bot.getLogger().debug("Unable to perform whois IP lookup: {}", args, ioe);
-                        }
-
+                        bot.getLogger().debug("Unable to perform whois IP lookup: {}", args, ioe);
                         bot.send("Unable to perform whois IP lookup: " + ioe.getMessage());
                     }
                 } else {
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
index 4b07647..23a1552 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
@@ -58,8 +58,8 @@ public class GoogleSearchTest extends LocalProperties {
     @SuppressWarnings("PMD.PreserveStackTrace")
     @Test
     public void testSearchGoogle() throws ModuleException {
-        final String apiKey = LocalProperties.getProperty(GoogleSearch.GOOGLE_API_KEY_PROP);
-        final String cseKey = LocalProperties.getProperty(GoogleSearch.GOOGLE_CSE_KEY_PROP);
+        final String apiKey = getProperty(GoogleSearch.GOOGLE_API_KEY_PROP);
+        final String cseKey = getProperty(GoogleSearch.GOOGLE_CSE_KEY_PROP);
         try {
             List<Message> messages = GoogleSearch.searchGoogle("mobibot site:github.com", apiKey, cseKey);
             assertThat(messages).as("mobibot results not empty").isNotEmpty();
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
index 6ca4a84..0429945 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
@@ -40,18 +40,25 @@ class RockPaperScissorsTest {
     @Test
     fun testWinLoseOrDraw() {
         assertThat(
-            RockPaperScissors.winLoseOrDraw("scissors", "paper")).`as`("scissors vs. paper").isEqualTo("win")
+            RockPaperScissors.winLoseOrDraw("scissors", "paper")
+        ).`as`("scissors vs. paper").isEqualTo("win")
         assertThat(
-            RockPaperScissors.winLoseOrDraw("paper", "rock")).`as`("paper vs. rock").isEqualTo("win")
+            RockPaperScissors.winLoseOrDraw("paper", "rock")
+        ).`as`("paper vs. rock").isEqualTo("win")
         assertThat(
-            RockPaperScissors.winLoseOrDraw("rock", "scissors")).`as`("rock vs. scissors").isEqualTo("win")
+            RockPaperScissors.winLoseOrDraw("rock", "scissors")
+        ).`as`("rock vs. scissors").isEqualTo("win")
         assertThat(
-            RockPaperScissors.winLoseOrDraw("paper", "scissors")).`as`("paper vs. scissors").isEqualTo("lose")
+            RockPaperScissors.winLoseOrDraw("paper", "scissors")
+        ).`as`("paper vs. scissors").isEqualTo("lose")
         assertThat(
-            RockPaperScissors.winLoseOrDraw("rock", "paper")).`as`("rock vs. paper").isEqualTo("lose")
+            RockPaperScissors.winLoseOrDraw("rock", "paper")
+        ).`as`("rock vs. paper").isEqualTo("lose")
         assertThat(
-            RockPaperScissors.winLoseOrDraw("scissors", "rock")).`as`("scissors vs. rock").isEqualTo("lose")
+            RockPaperScissors.winLoseOrDraw("scissors", "rock")
+        ).`as`("scissors vs. rock").isEqualTo("lose")
         assertThat(
-            RockPaperScissors.winLoseOrDraw("scissors", "scissors")).`as`("scissors vs. scissors").isEqualTo("draw")
+            RockPaperScissors.winLoseOrDraw("scissors", "scissors")
+        ).`as`("scissors vs. scissors").isEqualTo("draw")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
index 5931cd5..0b77df5 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
@@ -61,7 +61,7 @@ public class StockQuoteTest extends LocalProperties {
             assertThat(messages.get(0).getText()).as("same stock symbol").contains("AAPL").contains("Apple Inc.");
 
             try {
-                StockQuote.getQuote("012", apiKey);
+                StockQuote.getQuote("blahfoo", apiKey);
             } catch (ModuleException e) {
                 assertThat(e.getMessage()).as("invalid symbol").containsIgnoringCase(StockQuote.INVALID_SYMBOL);
             }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
index b1514a9..f289a79 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
@@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @created 2019-04-19
  * @since 1.0
  */
-public class TwitterTest {
+public class TwitterTest extends LocalProperties {
     @SuppressFBWarnings("MDM")
     private String getCi() {
         if ("true".equals(System.getenv("CIRCLECI"))) {
@@ -68,12 +68,12 @@ public class TwitterTest {
     public void testPostTwitter() throws ModuleException {
         final String msg = "Testing Twitter API from " + getCi();
         assertThat(Twitter.twitterPost(
-            LocalProperties.getProperty(Twitter.CONSUMER_KEY_PROP),
-            LocalProperties.getProperty(Twitter.CONSUMER_SECRET_PROP),
-            LocalProperties.getProperty(Twitter.TOKEN_PROP),
-            LocalProperties.getProperty(Twitter.TOKEN_SECRET_PROP),
-            LocalProperties.getProperty(Constants.TWITTER_HANDLE_PROP),
-            msg,
-            true).getText()).as("twitterPost(" + msg + ')').isEqualTo(msg);
+                getProperty(Twitter.CONSUMER_KEY_PROP),
+                getProperty(Twitter.CONSUMER_SECRET_PROP),
+                getProperty(Twitter.TOKEN_PROP),
+                getProperty(Twitter.TOKEN_SECRET_PROP),
+                getProperty(Constants.TWITTER_HANDLE_PROP),
+                msg,
+                true).getText()).as("twitterPost(" + msg + ')').isEqualTo(msg);
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
index f22e049..5eb40d4 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
@@ -53,21 +53,19 @@ public class Weather2Test extends LocalProperties {
     @SuppressFBWarnings("PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS")
     @Test
     public void testWeather() throws ModuleException {
-        List<Message> messages = Weather2.getWeather("98204", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP));
+        List<Message> messages = Weather2.getWeather("98204", getProperty(Weather2.OWM_API_KEY_PROP));
         assertThat(messages.get(0).getText()).as("is Everett").contains("Everett").contains("US");
         assertThat(messages.get(messages.size() - 1).getText()).as("is City Search").endsWith("98204%2CUS");
 
-        messages = Weather2.getWeather("London, UK", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP));
+        messages = Weather2.getWeather("London, UK", getProperty(Weather2.OWM_API_KEY_PROP));
         assertThat(messages.get(0).getText()).as("is UK").contains("London").contains("UK");
         assertThat(messages.get(messages.size() - 1).getText()).as("is City Code").endsWith("4517009");
 
-        assertThatThrownBy(
-            () -> Weather2.getWeather("Montpellier, FR", LocalProperties.getProperty(Weather2.OWM_API_KEY_PROP))).as(
-            "Montpellier not found").hasCauseInstanceOf(APIException.class);
+        assertThatThrownBy(() -> Weather2.getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP)))
+                .as("Montpellier not found").hasCauseInstanceOf(APIException.class);
 
-        assertThatThrownBy(
-            () -> Weather2.getWeather("test", "")).as(
-            "no API key").isInstanceOf(ModuleException.class).hasNoCause();
+        assertThatThrownBy(() -> Weather2.getWeather("test", ""))
+                .as("no API key").isInstanceOf(ModuleException.class).hasNoCause();
 
         messages = Weather2.getWeather("", "apikey");
         assertThat(messages.get(0).isError()).as("no query").isTrue();

From e2faa55c9f977550661f7aeb6e3eb982c1239bc7 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 28 Apr 2020 20:52:30 -0700
Subject: [PATCH 044/262] Gradle upgrade.

---
 .idea/mobibot.iml                        | 2 +-
 .idea/modules/mobibot.main.iml           | 2 +-
 .idea/modules/mobibot.test.iml           | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 19d441c..94b4d4b 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+299" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+330" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index a2d494c..beb8f3c 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+299" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+330" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 2031057..b33ac37 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+299" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+330" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1db799f..de4250e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 5c3b2074badc7dd8e65797d8f3ab08846adb128e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 28 Apr 2020 21:01:18 -0700
Subject: [PATCH 045/262] Added Addons to handle adding commands & modules and
 related properties. Commands now have their own properties and are
 initialized with the bot instance.

---
 detekt-baseline.xml                           |   4 +-
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |   6 +-
 .../java/net/thauvin/erik/mobibot/Addons.kt   |  99 ++++++
 .../net/thauvin/erik/mobibot/Constants.java   |   9 +-
 .../net/thauvin/erik/mobibot/Mobibot.java     | 330 +++++-------------
 .../net/thauvin/erik/mobibot/TwitterTimer.kt  |   2 +-
 .../erik/mobibot/commands/AbstractCommand.kt  |  35 +-
 .../thauvin/erik/mobibot/commands/AddLog.kt   |   5 +-
 .../erik/mobibot/commands/ChannelFeed.kt      |  20 +-
 .../thauvin/erik/mobibot/commands/Cycle.kt    |   7 +-
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  27 +-
 .../net/thauvin/erik/mobibot/commands/Info.kt |  15 +-
 .../net/thauvin/erik/mobibot/commands/Me.kt   |   7 +-
 .../thauvin/erik/mobibot/commands/Modules.kt  |  20 +-
 .../net/thauvin/erik/mobibot/commands/Msg.kt  |   9 +-
 .../net/thauvin/erik/mobibot/commands/Nick.kt |   7 +-
 .../thauvin/erik/mobibot/commands/Recap.kt    |   7 +-
 .../net/thauvin/erik/mobibot/commands/Say.kt  |   7 +-
 .../thauvin/erik/mobibot/commands/Users.kt    |   7 +-
 .../erik/mobibot/commands/Versions.java       |  15 +-
 .../erik/mobibot/commands/links/Comment.kt    |   8 +-
 .../erik/mobibot/commands/links/Posting.kt    |  34 +-
 .../erik/mobibot/commands/links/Tags.kt       |   5 +-
 .../erik/mobibot/commands/links/UrlMgr.kt     |  32 +-
 .../erik/mobibot/commands/links/View.kt       |   9 +-
 .../erik/mobibot/commands/tell/Tell.java      | 171 ++++-----
 .../erik/mobibot/modules/AbstractModule.java  |  23 +-
 .../thauvin/erik/mobibot/modules/Calc.java    |   9 +-
 .../mobibot/modules/CurrencyConverter.java    |  25 +-
 .../thauvin/erik/mobibot/modules/Dice.java    |   7 +-
 .../erik/mobibot/modules/GoogleSearch.java    |  11 +-
 .../thauvin/erik/mobibot/modules/Joke.java    |  11 +-
 .../thauvin/erik/mobibot/modules/Lookup.java  |   9 +-
 .../thauvin/erik/mobibot/modules/Ping.java    |   7 +-
 .../erik/mobibot/modules/RockPaperScissors.kt |  17 +-
 .../erik/mobibot/modules/StockQuote.java      |  10 +-
 .../erik/mobibot/modules/ThreadedModule.java  |  17 +-
 .../thauvin/erik/mobibot/modules/Twitter.java | 139 +++++++-
 .../net/thauvin/erik/mobibot/modules/War.java |   7 +-
 .../erik/mobibot/modules/Weather2.java        |  12 +-
 .../erik/mobibot/modules/WorldTime.java       |  11 +-
 .../erik/mobibot/modules/CalcTest.java        |   2 +-
 .../modules/CurrencyConverterTest.java        |   2 +-
 .../mobibot/modules/GoogleSearchTest.java     |   2 +-
 .../erik/mobibot/modules/JokeTest.java        |   2 +-
 .../erik/mobibot/modules/LookupTest.java      |   2 +-
 .../erik/mobibot/modules/PingTest.java        |   2 +-
 .../erik/mobibot/modules/StockQuoteTest.java  |   2 +-
 .../erik/mobibot/modules/TwitterTest.java     |   3 +-
 .../erik/mobibot/modules/Weather2Test.java    |   2 +-
 .../erik/mobibot/modules/WordTimeTest.java    |   2 +-
 version.properties                            |   6 +-
 52 files changed, 669 insertions(+), 570 deletions(-)
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/Addons.kt

diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 6f5dcde..19a2a8f 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -2,7 +2,6 @@
 <SmellBaseline>
   <Blacklist></Blacklist>
   <Whitelist>
-    <ID>LongParameterList:AbstractCommand.kt$AbstractCommand$( bot: Mobibot, sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
@@ -11,10 +10,9 @@
     <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
     <ID>MagicNumber:Modules.kt$Modules$7</ID>
     <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
-    <ID>MagicNumber:UrlMgr.kt$UrlMgr$1000L</ID>
-    <ID>MagicNumber:UrlMgr.kt$UrlMgr$60L</ID>
     <ID>MagicNumber:Users.kt$Users$8</ID>
     <ID>MagicNumber:View.kt$View$8</ID>
+    <ID>NestedBlockDepth:Addons.kt$Addons$add</ID>
     <ID>NestedBlockDepth:Comment.kt$Comment$commandResponse</ID>
     <ID>NestedBlockDepth:UrlMgr.kt$UrlMgr$commandResponse</ID>
   </Whitelist>
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 2836f6f..686c1a4 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1587078052972L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1588132687770L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "alpha";
-    public static final String BUILDMETA = "294";
-    public static final String VERSION = "0.8.0-alpha+294";
+    public static final String BUILDMETA = "348";
+    public static final String VERSION = "0.8.0-alpha+348";
 
     /**
      * Disables the default constructor.
diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
new file mode 100644
index 0000000..64b7487
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
@@ -0,0 +1,99 @@
+/*
+ * Addons.java
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot
+
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.modules.AbstractModule
+import java.util.*
+import kotlin.collections.ArrayList
+
+/**
+ * Modules and Commands addons.
+ */
+class Addons {
+    val commands: MutableList<AbstractCommand> = ArrayList()
+    val modules: MutableList<AbstractModule> = ArrayList()
+    val modulesNames: MutableList<String> = ArrayList()
+    val names: MutableList<String> = ArrayList()
+    val ops: MutableList<String> = ArrayList()
+
+    /**
+     * Add a module with properties.
+     */
+    fun add(module: AbstractModule, props: Properties) {
+        with(module) {
+            if (hasProperties()) {
+                propertyKeys.forEach {
+                    setProperty(it, props.getProperty(it, ""))
+                }
+            }
+
+            if (isEnabled) {
+                modules.add(this)
+                modulesNames.add(this.javaClass.simpleName)
+                names.addAll(this.commands)
+            }
+        }
+    }
+
+    /**
+     * Add a command with properties.
+     */
+    fun add(command: AbstractCommand, props: Properties) {
+        with(command) {
+            if (hasProperties()) {
+                getPropertyKeys().forEach {
+                    setProperty(it, props.getProperty(it, ""))
+                }
+            }
+            if (isEnabled()) {
+                commands.add(this)
+                if (isVisible) {
+                    if (isOp) {
+                        ops.add(name)
+                    } else {
+                        names.add(name)
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Sort commands and modules names.
+     */
+    fun sort() {
+        names.sort()
+        ops.sort()
+        modulesNames.sort()
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.java b/src/main/java/net/thauvin/erik/mobibot/Constants.java
index eaf8d2d..ee86294 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.java
@@ -94,14 +94,7 @@ public final class Constants {
      * The timer delay in minutes.
      */
     public static final long TIMER_DELAY = 10L;
-    /**
-     * The twitter post flag property key.
-     */
-    public static final String TWITTER_AUTOPOST_PROP = "twitter-auto-post";
-    /**
-     * The Twitter handle property key.
-     */
-    public static final String TWITTER_HANDLE_PROP = "twitter-handle";
+
     /**
      * Properties version line argument.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index affe915..5911a83 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -62,7 +62,6 @@ import net.thauvin.erik.mobibot.modules.Dice;
 import net.thauvin.erik.mobibot.modules.GoogleSearch;
 import net.thauvin.erik.mobibot.modules.Joke;
 import net.thauvin.erik.mobibot.modules.Lookup;
-import net.thauvin.erik.mobibot.modules.ModuleException;
 import net.thauvin.erik.mobibot.modules.Ping;
 import net.thauvin.erik.mobibot.modules.RockPaperScissors;
 import net.thauvin.erik.mobibot.modules.StockQuote;
@@ -94,12 +93,8 @@ import java.io.InputStream;
 import java.io.PrintStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
-import java.util.Set;
 import java.util.Timer;
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -116,7 +111,9 @@ import static org.apache.commons.lang3.StringUtils.lowerCase;
 @Version(properties = "version.properties",
          className = "ReleaseInfo")
 public class Mobibot extends PircBot {
-    // Info strings
+    /**
+     * Info Strings.
+     */
     @SuppressWarnings("indentation")
     public static final List<String> INFO =
             List.of(
@@ -129,16 +126,8 @@ public class Mobibot extends PircBot {
     private static final int MAX_RECONNECT = 10;
     // Timer
     private static final Timer TIMER = new Timer(true);
-    // Ignore command
-    public final Ignore ignoreCommand;
-    // Automatically post links to Twitter
-    public final boolean isTwitterAutoPost;
-    // Tell object
-    public final Tell tell;
-    // Commands
-    private final List<AbstractCommand> commands = new ArrayList<>(20);
-    // Commands Names
-    private final List<String> commandsNames = new ArrayList<>();
+    // Commands and Modules
+    private final Addons addons = new Addons();
     // Main channel
     private final String ircChannel;
     // IRC port
@@ -149,20 +138,12 @@ public class Mobibot extends PircBot {
     private final Level loggerLevel;
     // Log directory
     private final String logsDir;
-    // Modules
-    private final List<AbstractModule> modules = new ArrayList<>(0);
-    // Modules
-    private final List<String> modulesNames = new ArrayList<>(0);
-    // Operators commands names
-    private final List<String> opsCommandsNames = new ArrayList<>();
+    // Tell command
+    private final Tell tell;
     // Today's date
     private final String today = Utils.today();
-    // Twitter auto-posts.
-    private final Set<Integer> twitterEntries = new HashSet<>();
-    // Twitter handle for channel join notifications
-    private final String twitterHandle;
     // Twitter module
-    private final Twitter twitterModule;
+    private final Twitter twitter;
     // Backlogs URL
     private String backLogsUrl = "";
     // Ident message
@@ -176,7 +157,6 @@ public class Mobibot extends PircBot {
     // Weblog URL
     private String weblogUrl = "";
 
-
     /**
      * Creates a new {@link Mobibot} instance.
      *
@@ -226,71 +206,51 @@ public class Mobibot extends PircBot {
         setPinboardAuth(p.getProperty("pinboard-api-token"));
 
         // Load the commands
-        addCommand(new AddLog());
-        addCommand(new ChannelFeed(getChannelName(), p.getProperty("feed", "")));
-        addCommand(new Cycle());
-        addCommand(new Info());
-        addCommand(new Me());
-        addCommand(new Modules());
-        addCommand(new Msg());
-        addCommand(new Nick());
-        addCommand(new Recap());
-        addCommand(new Say());
-        addCommand(new Users());
-        addCommand(new Versions());
-
-        // Ignore command
-        ignoreCommand = new Ignore(p.getProperty("ignore", ""));
-        addCommand(ignoreCommand);
+        addons.add(new AddLog(this), p);
+        addons.add(new ChannelFeed(this, getChannelName()), p);
+        addons.add(new Cycle(this), p);
+        addons.add(new Ignore(this), p);
+        addons.add(new Info(this), p);
+        addons.add(new Me(this), p);
+        addons.add(new Modules(this), p);
+        addons.add(new Msg(this), p);
+        addons.add(new Nick(this), p);
+        addons.add(new Recap(this), p);
+        addons.add(new Say(this), p);
+        addons.add(new Users(this), p);
+        addons.add(new Versions(this), p);
 
         // Tell command
-        tell = new Tell(this, p.getProperty("tell-max-days"), p.getProperty("tell-max-size"));
-        if (tell.isEnabled()) {
-            addCommand(tell);
-        }
+        tell = new Tell(this);
+        addons.add(tell, p);
 
         // Load the links commands
-        addCommand(new Comment());
-        addCommand(new Posting());
-        addCommand(new Tags());
-        addCommand(new UrlMgr(p.getProperty("tags", ""), p.getProperty("tags-keywords", "")));
-        addCommand(new View());
+        addons.add(new Comment(this), p);
+        addons.add(new Posting(this), p);
+        addons.add(new Tags(this), p);
+        addons.add(new UrlMgr(this), p);
+        addons.add(new View(this), p);
 
         // Load the modules
-        addModule(new Calc());
-        addModule(new CurrencyConverter());
-        addModule(new Dice());
-        addModule(new GoogleSearch());
-        addModule(new Joke());
-        addModule(new Lookup());
-        addModule(new Ping());
-        addModule(new RockPaperScissors());
-        addModule(new StockQuote());
-        addModule(new War());
-        addModule(new Weather2());
-        addModule(new WorldTime());
+        addons.add(new Calc(this), p);
+        addons.add(new CurrencyConverter(this), p);
+        addons.add(new Dice(this), p);
+        addons.add(new GoogleSearch(this), p);
+        addons.add(new Joke(this), p);
+        addons.add(new Lookup(this), p);
+        addons.add(new Ping(this), p);
+        addons.add(new RockPaperScissors(this), p);
+        addons.add(new StockQuote(this), p);
+        addons.add(new War(this), p);
+        addons.add(new Weather2(this), p);
+        addons.add(new WorldTime(this), p);
 
         // Twitter module
-        twitterModule = new Twitter();
-        addModule(twitterModule);
+        twitter = new Twitter(this);
+        addons.add(twitter, p);
 
-        // Load the modules properties
-        modules.stream().filter(AbstractModule::hasProperties).forEach(module -> {
-            for (final String s : module.getPropertyKeys()) {
-                module.setProperty(s, p.getProperty(s, ""));
-            }
-        });
-
-        // Twitter extra properties
-        twitterHandle = p.getProperty(Constants.TWITTER_HANDLE_PROP, "");
-        isTwitterAutoPost =
-                Boolean.parseBoolean(p.getProperty(Constants.TWITTER_AUTOPOST_PROP, "false"))
-                && twitterModule.isEnabled();
-
-        // Sort the command & module names
-        Collections.sort(commandsNames);
-        Collections.sort(opsCommandsNames);
-        Collections.sort(modulesNames);
+        // Sort the addons
+        addons.sort();
 
         // Save the entries
         UrlMgr.saveEntries(this, true);
@@ -415,33 +375,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Adds a command.
-     *
-     * @param command The command to add.
-     */
-    private void addCommand(final AbstractCommand command) {
-        commands.add(command);
-        if (command.isVisible()) {
-            if (command.isOp()) {
-                opsCommandsNames.add(command.getCommand());
-            } else {
-                commandsNames.add(command.getCommand());
-            }
-        }
-    }
-
-    /**
-     * Adds a module.
-     *
-     * @param module The module to add.
-     */
-    private void addModule(final AbstractModule module) {
-        modules.add(module);
-        modulesNames.add(module.getClass().getSimpleName());
-        commandsNames.addAll(module.getCommands());
-    }
-
     /**
      * Adds pin on pinboard.
      *
@@ -487,10 +420,13 @@ public class Mobibot extends PircBot {
      *
      * @param entry The entry to delete.
      */
-    public final void deletePin(final EntryLink entry) {
+    public final void deletePin(final int index, final EntryLink entry) {
         if (pinboard != null) {
             pinboard.deletePost(entry);
         }
+        if (twitter.isAutoPost()) {
+            twitter.removeEntry(index);
+        }
     }
 
     /**
@@ -554,7 +490,7 @@ public class Mobibot extends PircBot {
      * @return The modules names.
      */
     public final List<String> getModulesNames() {
-        return modulesNames;
+        return addons.getModulesNames();
     }
 
     /**
@@ -577,6 +513,15 @@ public class Mobibot extends PircBot {
         return buff.toString();
     }
 
+    /**
+     * Returns the Tell command.
+     *
+     * @return The tell command.
+     */
+    public final Tell getTell() {
+        return tell;
+    }
+
     /**
      * Returns the bot's timer.
      *
@@ -595,6 +540,15 @@ public class Mobibot extends PircBot {
         return today;
     }
 
+    /**
+     * Returns the Twitter command.
+     *
+     * @return The Twitter command.
+     */
+    public final Twitter getTwitter() {
+        return twitter;
+    }
+
     /**
      * Returns the weblog URL.
      *
@@ -613,9 +567,9 @@ public class Mobibot extends PircBot {
      * @return {@code true} if the topic was found, {@code false} otherwise.
      */
     private boolean helpCommands(final String sender, final String topic, final boolean isPrivate) {
-        for (final AbstractCommand command : commands) {
-            if (command.isVisible() && command.getCommand().startsWith(topic)) {
-                return command.helpResponse(this, topic, sender, isOp(sender), isPrivate);
+        for (final AbstractCommand command : addons.getCommands()) {
+            if (command.isVisible() && command.getName().startsWith(topic)) {
+                return command.helpResponse(topic, sender, isOp(sender), isPrivate);
             }
         }
         return false;
@@ -635,10 +589,10 @@ public class Mobibot extends PircBot {
              Utils.helpIndent(Utils.helpFormat("%c " + Constants.HELP_CMD + " <command>", getNick(), isPrivate)),
              isPrivate);
         send(sender, "The commands are:", isPrivate);
-        sendList(sender, commandsNames, 8, isPrivate, true);
+        sendList(sender, addons.getNames(), 8, isPrivate, true);
         if (isOp) {
             send(sender, "The op commands are:", isPrivate);
-            sendList(sender, opsCommandsNames, 8, isPrivate, true);
+            sendList(sender, addons.getOps(), 8, isPrivate, true);
         }
     }
 
@@ -651,13 +605,11 @@ public class Mobibot extends PircBot {
      * @return {@code true} if the topic was found, {@code false} otherwise.
      */
     private boolean helpModules(final String sender, final String topic, final boolean isPrivate) {
-        for (final AbstractModule module : modules) {
-            if (module.isEnabled()) {
-                for (final String cmd : module.getCommands()) {
-                    if (topic.equals(cmd)) {
-                        module.helpResponse(this, sender, isPrivate);
-                        return true;
-                    }
+        for (final AbstractModule module : addons.getModules()) {
+            for (final String cmd : module.getCommands()) {
+                if (topic.equals(cmd)) {
+                    module.helpResponse(sender, isPrivate);
+                    return true;
                 }
             }
         }
@@ -721,7 +673,7 @@ public class Mobibot extends PircBot {
      */
     public final void joinChannel() {
         joinChannel(ircChannel);
-        twitterNotification("has joined " + ircChannel);
+        twitter.notification("%1$s %2$s has joined %3$s");
     }
 
     /**
@@ -746,9 +698,7 @@ public class Mobibot extends PircBot {
                                    final String message) {
         LOGGER.debug(">>> {} : {}", sender, message);
 
-        if (tell.isEnabled()) {
-            tell.send(sender, true);
-        }
+        tell.send(sender, true);
 
         if (message.matches(getNickPattern() + ":.*")) { // mobibot: <command>
             final String[] cmds = message.substring(message.indexOf(':') + 1).trim().split(" ", 2);
@@ -764,17 +714,17 @@ public class Mobibot extends PircBot {
                 helpResponse(sender, args, false);
             } else {
                 // Commands
-                for (final AbstractCommand command : commands) {
-                    if (command.isPublic() && command.getCommand().startsWith(cmd)) {
-                        command.commandResponse(this, sender, login, args, isOp(sender), false);
+                for (final AbstractCommand command : addons.getCommands()) {
+                    if (command.isPublic() && command.getName().startsWith(cmd)) {
+                        command.commandResponse(sender, login, args, isOp(sender), false);
                         return;
                     }
                 }
                 // Modules
-                for (final AbstractModule module : modules) { // modules
+                for (final AbstractModule module : addons.getModules()) { // modules
                     for (final String c : module.getCommands()) {
                         if (cmd.startsWith(c)) {
-                            module.commandResponse(this, sender, cmd, args, false);
+                            module.commandResponse(sender, cmd, args, false);
                             return;
                         }
                     }
@@ -782,9 +732,9 @@ public class Mobibot extends PircBot {
             }
         } else {
             // Commands, e.g.: https://www.example.com/
-            for (final AbstractCommand command : commands) {
+            for (final AbstractCommand command : addons.getCommands()) {
                 if (command.matches(message)) {
-                    command.commandResponse(this, sender, login, message, isOp(sender), false);
+                    command.commandResponse(sender, login, message, isOp(sender), false);
                     return;
                 }
             }
@@ -816,6 +766,7 @@ public class Mobibot extends PircBot {
         if (cmd.startsWith(Constants.HELP_CMD)) { // help
             helpResponse(sender, args, true);
         } else if (isOp && "kill".equals(cmd)) { // kill
+            twitter.notification("%1$s killed by " + sender + "on %3$s");
             sendRawLine("QUIT : Poof!");
             System.exit(0);
         } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) { // debug
@@ -828,23 +779,23 @@ public class Mobibot extends PircBot {
         } else if (isOp && Constants.DIE_CMD.equals(cmd)) { // die
             send(sender + " has just signed my death sentence.");
             TIMER.cancel();
-            twitterShutdown();
-            twitterNotification("killed by  " + sender + " on " + ircChannel);
+            twitter.shutdown();
+            twitter.notification("%1$s stopped by " + sender + "on %3$s");
             sleep(3);
             quitServer("The Bot Is Out There!");
             System.exit(0);
         } else {
-            for (final AbstractCommand command : commands) {
-                if (command.getCommand().startsWith(cmd)) {
-                    command.commandResponse(this, sender, login, args, isOp, true);
+            for (final AbstractCommand command : addons.getCommands()) {
+                if (command.getName().startsWith(cmd)) {
+                    command.commandResponse(sender, login, args, isOp, true);
                     return;
                 }
             }
-            for (final AbstractModule module : modules) {
+            for (final AbstractModule module : addons.getModules()) {
                 if (module.isPrivateMsgEnabled()) {
                     for (final String c : module.getCommands()) {
                         if (cmd.equals(c)) {
-                            module.commandResponse(this, sender, cmd, args, true);
+                            module.commandResponse(sender, cmd, args, true);
                             return;
                         }
                     }
@@ -870,9 +821,7 @@ public class Mobibot extends PircBot {
      */
     @Override
     protected void onJoin(final String channel, final String sender, final String login, final String hostname) {
-        if (tell.isEnabled()) {
-            tell.send(sender);
-        }
+        tell.send(sender);
     }
 
     /**
@@ -880,9 +829,7 @@ public class Mobibot extends PircBot {
      */
     @Override
     protected void onNickChange(final String oldNick, final String login, final String hostname, final String newNick) {
-        if (tell.isEnabled()) {
-            tell.send(newNick);
-        }
+        tell.send(newNick);
     }
 
     /**
@@ -1012,91 +959,6 @@ public class Mobibot extends PircBot {
         }
     }
 
-    /**
-     * Add an entry to be posted on Twitter.
-     *
-     * @param index The entry index.
-     */
-    public void twitterAddEntry(final int index) {
-        twitterEntries.add(index);
-    }
-
-    /**
-     * Post an entry to twitter.
-     *
-     * @param index The post entry index.
-     */
-    @SuppressFBWarnings("SUI_CONTAINS_BEFORE_REMOVE")
-    public final void twitterEntryPost(final int index) {
-        if (isTwitterAutoPost && twitterEntries.contains(index) && UrlMgr.getEntriesCount() >= index) {
-            final EntryLink entry = UrlMgr.getEntry(index);
-            final String msg =
-                    entry.getTitle() + ' ' + entry.getLink() + " via " + entry.getNick() + " on " + getChannel();
-            new Thread(() -> {
-                try {
-                    if (LOGGER.isDebugEnabled()) {
-                        LOGGER.debug("Posting {}{} to Twitter.", Constants.LINK_CMD, index + 1);
-                    }
-                    twitterModule.post(twitterHandle, msg, false);
-                } catch (ModuleException e) {
-                    LOGGER.warn("Failed to post entry on Twitter.", e);
-                }
-            }).start();
-            twitterEntries.remove(index);
-        }
-    }
-
-    /**
-     * Return the total count of links to be posted to twitter.
-     *
-     * @return The count of twitter links.
-     */
-    public final int twitterLinksCount() {
-        return twitterEntries.size();
-    }
-
-    /**
-     * Send a notification to the registered Twitter handle.
-     *
-     * @param msg The twitter message.
-     */
-    final void twitterNotification(final String msg) {
-        if (twitterModule.isEnabled() && isNotBlank(twitterHandle)) {
-            new Thread(() -> {
-                try {
-                    twitterModule.post(
-                            twitterHandle,
-                            getName() + ' ' + ReleaseInfo.VERSION + " " + msg,
-                            true);
-                } catch (ModuleException e) {
-                    LOGGER.warn("Failed to notify @{}: {}", twitterHandle, msg, e);
-                }
-            }).start();
-        }
-    }
-
-    /**
-     * Removes entry from Twitter auto-post.
-     *
-     * @param index The entry's index.
-     */
-    public final void twitterRemoveEntry(final int index) {
-        twitterEntries.remove(index);
-    }
-
-
-    /**
-     * Post all the links on twitter on shutdown.
-     */
-    final void twitterShutdown() {
-        if (twitterModule.isEnabled() && isNotBlank(twitterHandle)) {
-            LOGGER.debug("Twitter shutdown.");
-            for (final int i : twitterEntries) {
-                twitterEntryPost(i);
-            }
-        }
-    }
-
     /**
      * Updates pin on pinboard.
      *
diff --git a/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt b/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
index 09abe27..5db5a93 100644
--- a/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
@@ -36,6 +36,6 @@ import java.util.*
 
 class TwitterTimer(var bot: Mobibot, private var index: Int) : TimerTask() {
     override fun run() {
-        bot.twitterEntryPost(index)
+        bot.twitter.postEntry(index)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 99a678c..df19332 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -34,16 +34,18 @@ package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
+import java.util.concurrent.ConcurrentHashMap
 
-abstract class AbstractCommand {
-    abstract val command: String
+abstract class AbstractCommand(val bot: Mobibot) {
+    abstract val name: String
     abstract val help: List<String>
     abstract val isOp: Boolean
     abstract val isPublic: Boolean
     abstract val isVisible: Boolean
 
+    private val properties: MutableMap<String, String> = ConcurrentHashMap()
+
     abstract fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
@@ -51,7 +53,7 @@ abstract class AbstractCommand {
         isPrivate: Boolean
     )
 
-    open fun helpResponse(bot: Mobibot, command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
+    open fun helpResponse(command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
         if (!this.isOp || this.isOp == isOp) {
             for (h in help) {
                 bot.send(sender, Utils.helpFormat(h, bot.nick, isPrivate), isPrivate)
@@ -61,7 +63,32 @@ abstract class AbstractCommand {
         return false
     }
 
+    open fun getProperty(key: String) : String? {
+        return properties[key]
+    }
+    open fun getPropertyKeys(): Set<String> {
+        return properties.keys
+    }
+
+    open fun hasProperties(): Boolean {
+        return properties.isNotEmpty()
+    }
+
+    open fun initProperties(vararg keys: String) {
+        keys.forEach {
+            properties[it] = ""
+        }
+    }
+
+    open fun isEnabled(): Boolean {
+        return true
+    }
+
     open fun matches(message: String): Boolean {
         return false
     }
+
+    open fun setProperty(key: String, value: String) {
+        properties[key] = value
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
index 0c01306..addface 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
@@ -38,15 +38,14 @@ import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.getHistory
 import net.thauvin.erik.mobibot.entries.EntriesMgr
 import java.io.File
 
-class AddLog : AbstractCommand() {
-    override val command = "addlog"
+class AddLog(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "addlog"
     override val help = emptyList<String>()
     override val isOp = true
     override val isPublic = false
     override val isVisible = false
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index a5ce92a..b97f260 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -35,10 +35,9 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.FeedReader
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
-import org.apache.commons.lang3.StringUtils.isNotBlank
 
-class ChannelFeed(channel: String, private val feedUrl: String) : AbstractCommand() {
-    override val command = channel
+class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
+    override val name = channel
     override val help = listOf(
         "To list the last 5 posts from the channel's weblog feed:",
         Utils.helpIndent("%c $channel")
@@ -47,18 +46,23 @@ class ChannelFeed(channel: String, private val feedUrl: String) : AbstractComman
     override val isPublic = true
     override val isVisible = true
 
+    companion object {
+        const val FEED_PROP = "feed"
+    }
+
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        if (isNotBlank(feedUrl)) {
-            Thread(FeedReader(bot, sender, feedUrl)).start()
-        } else {
-            bot.send(sender, "There is no feed setup for this channel.", false)
+        with(getProperty(FEED_PROP)) {
+            if (!this.isNullOrBlank()) {
+                Thread(FeedReader(bot, sender, this)).start()
+            } else {
+                bot.send(sender, "There is no feed setup for this channel.", false)
+            }
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
index cfd7938..dbccdd6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -35,12 +35,12 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 
-class Cycle : AbstractCommand() {
+class Cycle(bot: Mobibot) : AbstractCommand(bot) {
     private val wait = 10
-    override val command = "cycle"
+    override val name = "cycle"
     override val help = listOf(
        "To have the bot leave the channel and come back:",
-        Utils.helpIndent("%c $command")
+        Utils.helpIndent("%c $name")
     )
     override val isOp = true
     override val isPublic = false
@@ -48,7 +48,6 @@ class Cycle : AbstractCommand() {
 
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index 79c6a08..2999272 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -37,29 +37,27 @@ import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.links.UrlMgr
 import java.util.*
 
-class Ignore(defaultIgnore: String) : AbstractCommand() {
+class Ignore(bot: Mobibot) : AbstractCommand(bot) {
     private val me = "me"
 
     init {
-        if (defaultIgnore.isNotBlank()) {
-            ignored.addAll(defaultIgnore.split(UrlMgr.LINK_MATCH.toRegex()))
-        }
+        initProperties(IGNORE_PROP)
     }
 
-    override val command = IGNORE_CMD
+    override val name = IGNORE_CMD
     override val help = listOf(
         "To ignore a link posted to the channel:",
         Utils.helpIndent("https://www.foo.bar %n"),
         "To check your ignore status:",
-        Utils.helpIndent("%c $command"),
+        Utils.helpIndent("%c $name"),
         "To toggle your ignore status:",
-        Utils.helpIndent("%c $command $me")
+        Utils.helpIndent("%c $name $me")
     )
     private val helpOp = listOf(
         "To ignore a link posted to the channel:",
         Utils.helpIndent("https://www.foo.bar " + Utils.bold("%n"), false),
         "To add/remove nicks from the ignored list:",
-        Utils.helpIndent("%c $command <nick> [<nick> ...]")
+        Utils.helpIndent("%c $name <nick> [<nick> ...]")
     )
 
     override val isOp = false
@@ -68,6 +66,7 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
 
     companion object {
         const val IGNORE_CMD = "ignore"
+        const val IGNORE_PROP = IGNORE_CMD
         private val ignored = TreeSet<String>()
 
         @JvmStatic
@@ -77,7 +76,6 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
     }
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
@@ -94,7 +92,6 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
     }
 
     override fun helpResponse(
-        bot: Mobibot,
         command: String,
         sender: String,
         isOp: Boolean,
@@ -106,7 +103,7 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
             }
             true
         } else {
-            super.helpResponse(bot, command, sender, isOp, isPrivate)
+            super.helpResponse(command, sender, isOp, isPrivate)
         }
     }
 
@@ -149,4 +146,12 @@ class Ignore(defaultIgnore: String) : AbstractCommand() {
             bot.send(sender, "No one is currently ${Utils.bold("ignored")}.", isPrivate)
         }
     }
+
+    override fun setProperty(key: String, value: String) {
+        super.setProperty(key, value)
+        if (IGNORE_PROP == key) {
+            ignored.addAll(value.split(UrlMgr.LINK_MATCH.toRegex()))
+        }
+    }
+
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
index 0f2f4f9..fc6e546 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
@@ -37,18 +37,17 @@ import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.links.UrlMgr
 import java.lang.management.ManagementFactory
 
-class Info : AbstractCommand() {
-    override val command = "info"
+class Info(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "info"
     override val help = listOf(
         "To view information about the bot:",
-        Utils.helpIndent("%c $command")
+        Utils.helpIndent("%c $name")
     )
     override val isOp = false
     override val isPublic = true
     override val isVisible = true
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
@@ -56,7 +55,7 @@ class Info : AbstractCommand() {
         isPrivate: Boolean
     ) {
         for (info in Mobibot.INFO) {
-                bot.send(sender, info, isPrivate)
+            bot.send(sender, info, isPrivate)
         }
 
         val info = StringBuilder("Uptime: ")
@@ -67,13 +66,13 @@ class Info : AbstractCommand() {
             append(UrlMgr.entriesCount)
 
             if (isOp) {
-                if (bot.tell.isEnabled) {
+                if (bot.tell.isEnabled()) {
                     append(", Messages: ")
                     append(bot.tell.size())
                 }
-                if (bot.isTwitterAutoPost) {
+                if (bot.twitter.isAutoPost) {
                     append(", Twitter: ")
-                    append(bot.twitterLinksCount())
+                    append(bot.twitter.entriesCount())
                 }
             }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
index e7bd4d1..4b27cd7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
@@ -35,18 +35,17 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 
-class Me : AbstractCommand() {
-    override val command = "me"
+class Me(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "me"
     override val help = listOf(
         "To have the bot perform an action:",
-        Utils.helpIndent("%c $command <action>")
+        Utils.helpIndent("%c $name <action>")
     )
     override val isOp = true
     override val isPublic = false
     override val isVisible = true
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index e997677..af2f629 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -35,18 +35,17 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 
-class Modules : AbstractCommand() {
-    override val command = "modules"
+class Modules(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "modules"
     override val help = listOf(
         "To view a list of enabled modules:",
-        Utils.helpIndent("%c $command")
+        Utils.helpIndent("%c $name")
     )
     override val isOp = true
     override val isPublic = false
     override val isVisible = true
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
@@ -54,12 +53,13 @@ class Modules : AbstractCommand() {
         isPrivate: Boolean
     ) {
         if (isOp) {
-            val modulesNames = bot.modulesNames
-            if (modulesNames.isEmpty()) {
-                bot.send(sender, "There are no enabled modules.", isPrivate)
-            } else {
-                bot.send(sender, "The enabled modules are: ", isPrivate)
-                bot.sendList(sender, modulesNames, 7, isPrivate, false)
+            with(bot.modulesNames) {
+                if (isEmpty()) {
+                    bot.send(sender, "There are no enabled modules.", isPrivate)
+                } else {
+                    bot.send(sender, "The enabled modules are: ", isPrivate)
+                    bot.sendList(sender, this, 7, isPrivate, false)
+                }
             }
         } else {
             bot.helpDefault(sender, isOp, isPrivate)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
index 8f5814f..37c50df 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -35,18 +35,17 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 
-class Msg : AbstractCommand() {
-    override val command = "msg"
+class Msg(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "msg"
     override val help = listOf(
         "To have the bot send a private message to someone:",
-        Utils.helpIndent("%c $command <nick> <text>")
+        Utils.helpIndent("%c $name <nick> <text>")
     )
     override val isOp = true
     override val isPublic = true
     override val isVisible = true
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
@@ -58,7 +57,7 @@ class Msg : AbstractCommand() {
             if (args.length > 2) {
                 bot.send(msg[0], msg[1], isPrivate)
             } else {
-                helpResponse(bot, command, sender, isOp, isPrivate)
+                helpResponse(name, sender, isOp, isPrivate)
             }
         } else {
             bot.helpDefault(sender, isOp, isPrivate)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
index 95f3a55..6d12d2f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -35,18 +35,17 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 
-class Nick : AbstractCommand() {
-    override val command = "nick"
+class Nick(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "nick"
     override val help = listOf(
         "To change the bot's nickname:",
-        Utils.helpIndent("%c $command <nick>")
+        Utils.helpIndent("%c $name <nick>")
     )
     override val isOp = true
     override val isPublic = true
     override val isVisible = true
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
index 7dfbe5e..168a0cf 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -38,11 +38,11 @@ import java.time.Clock
 import java.time.LocalDateTime
 import java.util.*
 
-class Recap : AbstractCommand() {
-    override val command = "recap"
+class Recap(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "recap"
     override val help = listOf(
         "To list the last 10 public channel messages:",
-        Utils.helpIndent("%c $command")
+        Utils.helpIndent("%c $name")
     )
     override val isOp = false
     override val isPublic = true
@@ -76,7 +76,6 @@ class Recap : AbstractCommand() {
     }
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
index 19e9f7e..be8d6f0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
@@ -35,11 +35,11 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 
-class Say : AbstractCommand() {
-    override val command = "say"
+class Say(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "say"
     override val help = listOf(
         "To have the bot say something on the channel:",
-        Utils.helpIndent("%c $command <text>")
+        Utils.helpIndent("%c $name <text>")
     )
     override val isOp = true
     override val isPublic = false
@@ -47,7 +47,6 @@ class Say : AbstractCommand() {
 
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index 73524f3..49d1130 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -37,11 +37,11 @@ import net.thauvin.erik.mobibot.Utils
 import org.jibble.pircbot.User
 import java.util.*
 
-class Users : AbstractCommand() {
-    override val command = "users"
+class Users(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "users"
     override val help = listOf(
         "To list the users present on the channel:",
-        Utils.helpIndent("%c $command")
+        Utils.helpIndent("%c $name")
     )
     override val isOp = false
     override val isPublic = true
@@ -49,7 +49,6 @@ class Users : AbstractCommand() {
 
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 91f0044..7b80f3d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -50,9 +50,13 @@ public class Versions extends AbstractCommand {
                     + ", "
                     + System.getProperty("java.vm.info") + ')');
 
+    public Versions(@NotNull final Mobibot bot) {
+        super(bot);
+    }
+
     @NotNull
     @Override
-    public String getCommand() {
+    public String getName() {
         return "versions";
     }
 
@@ -61,7 +65,7 @@ public class Versions extends AbstractCommand {
     @Override
     public List<String> getHelp() {
         return List.of("To view the versions data (bot, java, etc.):",
-                       Utils.helpIndent("%s " + getCommand()));
+                       Utils.helpIndent("%s " + getName()));
     }
 
     @Override
@@ -80,18 +84,17 @@ public class Versions extends AbstractCommand {
     }
 
     @Override
-    public void commandResponse(@NotNull final Mobibot bot,
-                                @NotNull final String sender,
+    public void commandResponse(@NotNull final String sender,
                                 @NotNull final String login,
                                 @NotNull final String args,
                                 final boolean isOp,
                                 final boolean isPrivate) {
         if (isOp) {
             for (final String v : versions) {
-                bot.send(sender, v, isPrivate);
+                getBot().send(sender, v, isPrivate);
             }
         } else {
-            bot.helpDefault(sender, false, isPrivate);
+            getBot().helpDefault(sender, false, isPrivate);
         }
 
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 3e8d911..2ecba68 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -39,8 +39,8 @@ import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
 
-class Comment : AbstractCommand() {
-    override val command = COMMAND
+class Comment(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = COMMAND
     override val help = listOf(
         "To add a comment:",
         Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
@@ -59,7 +59,6 @@ class Comment : AbstractCommand() {
     }
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
@@ -89,13 +88,12 @@ class Comment : AbstractCommand() {
     }
 
     override fun helpResponse(
-        bot: Mobibot,
         command: String,
         sender: String,
         isOp: Boolean,
         isPrivate: Boolean
     ): Boolean {
-        if (super.helpResponse(bot, command, sender, isOp, isPrivate)) {
+        if (super.helpResponse(command, sender, isOp, isPrivate)) {
             if (isOp) {
                 bot.send(sender, "To change a comment's author:", isPrivate)
                 bot.send(
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index c5922b9..42e7e4d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -39,8 +39,8 @@ import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
 
-class Posting : AbstractCommand() {
-    override val command = "posting"
+class Posting(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "posting"
     override val help = listOf(
         "Post a URL, by saying it on a line on its own:",
         Utils.helpIndent("<url> [<title>] ${Tags.COMMAND}}: <+tag> [...]]"),
@@ -58,7 +58,6 @@ class Posting : AbstractCommand() {
     override val isVisible = true
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
@@ -70,14 +69,14 @@ class Posting : AbstractCommand() {
 
         if (index < UrlMgr.entriesCount) {
             when (val cmd = cmds[1].trim()) {
-                "" -> showEntry(bot, index)
-                "-" -> removeEntry(bot, sender, login, isOp, index) // L1:-
+                "" -> showEntry(index)
+                "-" -> removeEntry(sender, login, isOp, index) // L1:-
                 else -> {
                     when (cmd[0]) {
-                        '|' -> changeTitle(bot, cmd, index) // L1:|<title>
-                        '=' -> changeUrl(bot, cmd, login, isOp, index) // L1:=<url>
-                        '?' -> changeAuthor(bot, cmd, sender, isOp, index) // L1:?<author>
-                        else -> addComment(bot, cmd, sender, index) // L1:<comment>
+                        '|' -> changeTitle(cmd, index) // L1:|<title>
+                        '=' -> changeUrl(cmd, login, isOp, index) // L1:=<url>
+                        '?' -> changeAuthor(cmd, sender, isOp, index) // L1:?<author>
+                        else -> addComment(cmd, sender, index) // L1:<comment>
                     }
                 }
             }
@@ -88,7 +87,7 @@ class Posting : AbstractCommand() {
         return message.matches("${Constants.LINK_CMD}[0-9]+:.*".toRegex())
     }
 
-    private fun addComment(bot: Mobibot, cmd: String, sender: String, index: Int) {
+    private fun addComment(cmd: String, sender: String, index: Int) {
         val entry: EntryLink = UrlMgr.getEntry(index)
         val commentIndex = entry.addComment(cmd, sender)
         val comment = entry.getComment(commentIndex)
@@ -96,7 +95,7 @@ class Posting : AbstractCommand() {
         UrlMgr.saveEntries(bot, false)
     }
 
-    private fun changeTitle(bot: Mobibot, cmd: String, index: Int) {
+    private fun changeTitle(cmd: String, index: Int) {
         if (cmd.length > 1) {
             val entry: EntryLink = UrlMgr.getEntry(index)
             entry.title = cmd.substring(1).trim()
@@ -106,7 +105,7 @@ class Posting : AbstractCommand() {
         }
     }
 
-    private fun changeUrl(bot: Mobibot, cmd: String, login: String, isOp: Boolean, index: Int) {
+    private fun changeUrl(cmd: String, login: String, isOp: Boolean, index: Int) {
         val entry: EntryLink = UrlMgr.getEntry(index)
         if (entry.login == login || isOp) {
             val link = cmd.substring(1)
@@ -120,7 +119,7 @@ class Posting : AbstractCommand() {
         }
     }
 
-    private fun changeAuthor(bot: Mobibot, cmd: String, sender: String, isOp: Boolean, index: Int) {
+    private fun changeAuthor(cmd: String, sender: String, isOp: Boolean, index: Int) {
         if (isOp) {
             if (cmd.length > 1) {
                 val entry: EntryLink = UrlMgr.getEntry(index)
@@ -133,13 +132,10 @@ class Posting : AbstractCommand() {
         }
     }
 
-    private fun removeEntry(bot: Mobibot, sender: String, login: String, isOp: Boolean, index: Int) {
+    private fun removeEntry(sender: String, login: String, isOp: Boolean, index: Int) {
         val entry: EntryLink = UrlMgr.getEntry(index)
         if (entry.login == login || isOp) {
-            bot.deletePin(entry)
-            if (bot.isTwitterAutoPost) {
-                bot.twitterRemoveEntry(index)
-            }
+            bot.deletePin(index, entry)
             UrlMgr.removeEntry(index)
             bot.send("Entry ${Constants.LINK_CMD}${index + 1} removed.")
             UrlMgr.saveEntries(bot, false)
@@ -148,7 +144,7 @@ class Posting : AbstractCommand() {
         }
     }
 
-    private fun showEntry(bot: Mobibot, index: Int) {
+    private fun showEntry(index: Int) {
         val entry: EntryLink = UrlMgr.getEntry(index)
         bot.send(EntriesUtils.buildLink(index, entry))
         if (entry.hasTags()) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
index 6978794..511ca46 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -39,8 +39,8 @@ import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
 
-class Tags : AbstractCommand() {
-    override val command = COMMAND
+class Tags(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = COMMAND
     override val help = listOf(
         "To categorize or tag a URL, use its label and a T:",
         Utils.helpIndent("${Constants.LINK_CMD}1T:<+tag|-tag> [...]")
@@ -54,7 +54,6 @@ class Tags : AbstractCommand() {
     }
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
index 539094f..5a914a4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
@@ -34,7 +34,6 @@ package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.TwitterTimer
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.Ignore
@@ -44,22 +43,24 @@ import net.thauvin.erik.mobibot.entries.EntryLink
 import org.jsoup.Jsoup
 import java.io.IOException
 
-class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
-    private val keywords: List<String>
-    private val defaultTags: List<String>
-    override val command = Constants.LINK_CMD
+class UrlMgr(bot: Mobibot) : AbstractCommand(bot) {
+    private val keywords: MutableList<String> = ArrayList()
+    private val defaultTags: MutableList<String> = ArrayList()
+
+    override val name = Constants.LINK_CMD
     override val help = emptyList<String>()
     override val isOp = false
     override val isPublic = false
     override val isVisible = false
 
     init {
-        this.keywords = keywords.split(TAG_MATCH.toRegex())
-        this.defaultTags = defaultTags.split(TAG_MATCH.toRegex())
+        initProperties(TAGS_PROP, KEYWORDS_PROP)
     }
 
     companion object {
         const val LINK_MATCH = "^[hH][tT][tT][pP](|[sS])://.*"
+        const val KEYWORDS_PROP = "tags-keywords"
+        const val TAGS_PROP = "tags"
         const val TAG_MATCH = ", *| +"
 
         // Entries array
@@ -118,7 +119,6 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
     }
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
@@ -157,8 +157,8 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
                 // Add Entry to pinboard.
                 bot.addPin(entry)
 
-                // Queue link for posting to twitter
-                twitterPost(bot, index)
+                // Queue link for posting to Twitter.
+                bot.twitter.queueEntry(index)
 
                 saveEntries(bot, isBackup)
 
@@ -175,7 +175,6 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
     }
 
     override fun helpResponse(
-        bot: Mobibot,
         command: String,
         sender: String,
         isOp: Boolean,
@@ -234,11 +233,12 @@ class UrlMgr(defaultTags: String, keywords: String) : AbstractCommand() {
         return false
     }
 
-    private fun twitterPost(bot: Mobibot, index: Int) {
-        if (bot.isTwitterAutoPost) {
-            bot.twitterAddEntry(index)
-            bot.logger.debug("Scheduling ${Constants.LINK_CMD}${index + 1} for posting on Twitter.")
-            bot.timer.schedule(TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L)
+    override fun setProperty(key: String, value: String) {
+        super.setProperty(key, value)
+        if (KEYWORDS_PROP == key) {
+            keywords.addAll(value.split(TAG_MATCH.toRegex()))
+        } else if (KEYWORDS_PROP == key) {
+            defaultTags.addAll(value.split(TAG_MATCH.toRegex()))
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index 0edde92..329b190 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -40,12 +40,12 @@ import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.getEntry
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
 
-class View : AbstractCommand() {
+class View(bot: Mobibot) : AbstractCommand(bot) {
     private val maxEntries = 8
-    override val command = VIEW_CMD
+    override val name = VIEW_CMD
     override val help = listOf(
         "To list or search the current URL posts:",
-        Utils.helpIndent("%c $command [<start>] [<query>]")
+        Utils.helpIndent("%c $name [<start>] [<query>]")
     )
     override val isOp = false
     override val isPublic = true
@@ -56,7 +56,6 @@ class View : AbstractCommand() {
     }
 
     override fun commandResponse(
-        bot: Mobibot,
         sender: String,
         login: String,
         args: String,
@@ -110,7 +109,7 @@ class View : AbstractCommand() {
             i++
             if (sent == maxEntries && i < max) {
                 bot.send(
-                    sender, "To view more, try: " + Utils.bold("${bot.nick}: $command ${i + 1} $lcArgs"), false
+                    sender, "To view more, try: " + Utils.bold("${bot.nick}: $name ${i + 1} $lcArgs"), false
                 )
             }
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index fe96e9d..05efbec 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -50,45 +50,43 @@ import java.util.concurrent.CopyOnWriteArrayList;
  * @since 1.0
  */
 public class Tell extends AbstractCommand {
+    /**
+     * Max days property.
+     */
+    public static final String MAX_DAYS_PROP = "tell-max-days";
+    /**
+     * Max size proeprty.
+     */
+    public static final String MAX_SIZE_PROP = "tell-max-size";
     /**
      * The tell command.
      */
     public static final String TELL_CMD = "tell";
     // Arrow
     private static final String ARROW = " --> ";
-    // Default maximum number of days to keep messages
-    private static final int DEFAULT_TELL_MAX_DAYS = 7;
-    // Default message max queue size
-    private static final int DEFAULT_TELL_MAX_SIZE = 50;
     // Serialized object file extension
     private static final String SER_EXT = ".ser";
     // All keyword
     private static final String TELL_ALL_KEYWORD = "all";
     //T he delete command.
     private static final String TELL_DEL_KEYWORD = "del";
-    // Bot instance
-    private final Mobibot bot;
-    // Maximum number of days to keep messages
-    private final int maxDays;
-    // Message maximum queue size
-    private final int maxSize;
     // Messages queue
     private final List<TellMessage> messages = new CopyOnWriteArrayList<>();
     // Serialized object file
     private final String serializedObject;
+    // Maximum number of days to keep messages
+    private int maxDays = 7;
+    // Message maximum queue size
+    private int maxSize = 50;
 
     /**
      * Creates a new instance.
      *
-     * @param bot     The bot.
-     * @param maxDays Max days.
-     * @param maxSize Max size.
+     * @param bot The bot.
      */
-    public Tell(final Mobibot bot, final String maxDays, final String maxSize) {
-        super();
-        this.bot = bot;
-        this.maxDays = Utils.getIntProperty(maxDays, DEFAULT_TELL_MAX_DAYS);
-        this.maxSize = Utils.getIntProperty(maxSize, DEFAULT_TELL_MAX_SIZE);
+    public Tell(final Mobibot bot) {
+        super(bot);
+        initProperties(MAX_DAYS_PROP, MAX_SIZE_PROP);
 
         // Load the message queue
         serializedObject = bot.getLogsDir() + bot.getName() + SER_EXT;
@@ -106,7 +104,7 @@ public class Tell extends AbstractCommand {
      */
     @SuppressWarnings("WeakerAccess")
     final boolean clean() {
-        bot.getLogger().debug("Cleaning the messages.");
+        getBot().getLogger().debug("Cleaning the messages.");
         return TellMessagesMgr.clean(messages, maxDays);
     }
 
@@ -128,9 +126,9 @@ public class Tell extends AbstractCommand {
 
                 if (deleted) {
                     save();
-                    bot.send(sender, "Delivered messages have been deleted.", isPrivate);
+                    getBot().send(sender, "Delivered messages have been deleted.", isPrivate);
                 } else {
-                    bot.send(sender, "No delivered messages were found.", isPrivate);
+                    getBot().send(sender, "No delivered messages were found.", isPrivate);
                 }
 
             } else {
@@ -139,11 +137,11 @@ public class Tell extends AbstractCommand {
                 for (final TellMessage message : messages) {
                     found = message.isMatchId(id);
 
-                    if (found && (message.getSender().equalsIgnoreCase(sender) || bot.isOp(sender))) {
+                    if (found && (message.getSender().equalsIgnoreCase(sender) || getBot().isOp(sender))) {
                         messages.remove(message);
 
                         save();
-                        bot.send(sender, "Your message was deleted from the queue.", isPrivate);
+                        getBot().send(sender, "Your message was deleted from the queue.", isPrivate);
                         deleted = true;
                         break;
                     }
@@ -151,20 +149,20 @@ public class Tell extends AbstractCommand {
 
                 if (!deleted) {
                     if (found) {
-                        bot.send(sender, "Only messages that you sent can be deleted.", isPrivate);
+                        getBot().send(sender, "Only messages that you sent can be deleted.", isPrivate);
                     } else {
-                        bot.send(sender, "The specified message [ID " + id + "] could not be found.", isPrivate);
+                        getBot().send(sender, "The specified message [ID " + id + "] could not be found.", isPrivate);
                     }
                 }
             }
         } else {
-            helpResponse(bot, args, sender, isOp, isPrivate);
+            helpResponse(args, sender, isOp, isPrivate);
         }
     }
 
     @NotNull
     @Override
-    public String getCommand() {
+    public String getName() {
         return TELL_CMD;
     }
 
@@ -172,9 +170,9 @@ public class Tell extends AbstractCommand {
     @Override
     public List<String> getHelp() {
         return List.of("To send a message to someone when they join the channel:",
-                       Utils.helpIndent("%s " + TELL_CMD + " <nick> <message>"),
+                       Utils.helpIndent("%c " + TELL_CMD + " <nick> <message>"),
                        "To view queued and sent messages:",
-                       Utils.helpIndent("%s " + TELL_CMD + ' ' + View.VIEW_CMD),
+                       Utils.helpIndent("%c " + TELL_CMD + ' ' + View.VIEW_CMD),
                        "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."));
     }
 
@@ -194,17 +192,16 @@ public class Tell extends AbstractCommand {
     }
 
     @Override
-    public void commandResponse(@NotNull final Mobibot bot,
-                                @NotNull final String sender,
+    public void commandResponse(@NotNull final String sender,
                                 @NotNull final String login,
                                 @NotNull final String args,
                                 final boolean isOp,
                                 final boolean isPrivate) {
         if (isEnabled()) {
             if (StringUtils.isBlank(args)) {
-                helpResponse(bot, args, sender, isOp, isPrivate);
+                helpResponse(args, sender, isOp, isPrivate);
             } else if (args.startsWith(View.VIEW_CMD)) {
-                if (bot.isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(args)) {
+                if (getBot().isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(args)) {
                     viewAll(sender, isPrivate);
                 } else {
                     viewMessages(sender, isPrivate);
@@ -221,15 +218,21 @@ public class Tell extends AbstractCommand {
         }
     }
 
-    /**
-     * Returns <code>true</code> if enabled.
-     *
-     * @return <code>true</code> or <code>false</code>
-     */
+    @Override
     public boolean isEnabled() {
         return maxSize > 0 && maxDays > 0;
     }
 
+    @Override
+    public void setProperty(@NotNull final String key, @NotNull final String value) {
+        super.setProperty(key, value);
+        if (MAX_DAYS_PROP.equals(key)) {
+            this.maxDays = Utils.getIntProperty(value, maxDays);
+        } else if (MAX_SIZE_PROP.equals(key)) {
+            this.maxSize = Utils.getIntProperty(value, maxSize);
+        }
+    }
+
     // New message.
     private void newMessage(final String sender, final String args, final boolean isOp, final boolean isPrivate) {
         final String[] split = args.split(" ", 2);
@@ -242,13 +245,13 @@ public class Tell extends AbstractCommand {
 
                 save();
 
-                bot.send(sender, "Message [ID " + message.getId() + "] was queued for "
-                                 + Utils.bold(message.getRecipient()), isPrivate);
+                getBot().send(sender, "Message [ID " + message.getId() + "] was queued for "
+                                      + Utils.bold(message.getRecipient()), isPrivate);
             } else {
-                bot.send(sender, "Sorry, the messages queue is currently full.", isPrivate);
+                getBot().send(sender, "Sorry, the messages queue is currently full.", isPrivate);
             }
         } else {
-            helpResponse(bot, args, sender, isOp, isPrivate);
+            helpResponse(args, sender, isOp, isPrivate);
         }
     }
 
@@ -257,7 +260,7 @@ public class Tell extends AbstractCommand {
      */
     @SuppressWarnings("WeakerAccess")
     final void save() {
-        TellMessagesMgr.save(serializedObject, messages, bot.getLogger());
+        TellMessagesMgr.save(serializedObject, messages, getBot().getLogger());
     }
 
     /**
@@ -267,14 +270,14 @@ public class Tell extends AbstractCommand {
      * @param isMessage The message flag.
      */
     public void send(final String nickname, final boolean isMessage) {
-        if (!nickname.equals(bot.getNick()) && isEnabled()) {
+        if (isEnabled() && !nickname.equals(getBot().getNick())) {
             messages.stream().filter(message -> message.isMatch(nickname)).forEach(message -> {
                 if (message.getRecipient().equalsIgnoreCase(nickname) && !message.isReceived()) {
                     if (message.getSender().equals(nickname)) {
                         if (!isMessage) {
-                            bot.send(nickname, Utils.bold("You") + " wanted me to remind you: "
-                                               + Utils.reverseColor(message.getMessage()),
-                                     true);
+                            getBot().send(nickname, Utils.bold("You") + " wanted me to remind you: "
+                                                    + Utils.reverseColor(message.getMessage()),
+                                          true);
 
                             message.setIsReceived();
                             message.setIsNotified();
@@ -282,9 +285,9 @@ public class Tell extends AbstractCommand {
                             save();
                         }
                     } else {
-                        bot.send(nickname, message.getSender() + " wanted me to tell you: "
-                                           + Utils.reverseColor(message.getMessage()),
-                                 true);
+                        getBot().send(nickname, message.getSender() + " wanted me to tell you: "
+                                                + Utils.reverseColor(message.getMessage()),
+                                      true);
 
                         message.setIsReceived();
 
@@ -292,12 +295,12 @@ public class Tell extends AbstractCommand {
                     }
                 } else if (message.getSender().equalsIgnoreCase(nickname) && message.isReceived()
                            && !message.isNotified()) {
-                    bot.send(nickname,
-                             "Your message "
-                             + Utils.reverseColor("[ID " + message.getId() + ']') + " was sent to "
-                             + Utils.bold(message.getRecipient()) + " on "
-                             + Utils.utcDateTime(message.getReceived()),
-                             true);
+                    getBot().send(nickname,
+                                  "Your message "
+                                  + Utils.reverseColor("[ID " + message.getId() + ']') + " was sent to "
+                                  + Utils.bold(message.getRecipient()) + " on "
+                                  + Utils.utcDateTime(message.getReceived()),
+                                  true);
 
                     message.setIsNotified();
 
@@ -329,13 +332,13 @@ public class Tell extends AbstractCommand {
     private void viewAll(final String sender, final boolean isPrivate) {
         if (!messages.isEmpty()) {
             for (final TellMessage message : messages) {
-                bot.send(sender, Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
-                                 + " [ID: " + message.getId() + ", "
-                                 + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
-                         isPrivate);
+                getBot().send(sender, Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
+                                      + " [ID: " + message.getId() + ", "
+                                      + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
+                              isPrivate);
             }
         } else {
-            bot.send(sender, "There are no messages in the queue.", isPrivate);
+            getBot().send(sender, "There are no messages in the queue.", isPrivate);
         }
     }
 
@@ -347,41 +350,41 @@ public class Tell extends AbstractCommand {
             if (message.isMatch(sender)) {
                 if (!hasMessage) {
                     hasMessage = true;
-                    bot.send(sender, "Here are your messages: ", isPrivate);
+                    getBot().send(sender, "Here are your messages: ", isPrivate);
                 }
 
                 if (message.isReceived()) {
-                    bot.send(sender,
-                             Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
-                             + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
-                             + Utils.bold(message.getId()) + ", DELIVERED]",
-                             isPrivate);
+                    getBot().send(sender,
+                                  Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
+                                  + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
+                                  + Utils.bold(message.getId()) + ", DELIVERED]",
+                                  isPrivate);
 
                 } else {
-                    bot.send(sender,
-                             Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
-                             + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
-                             + Utils.bold(message.getId()) + ", QUEUED]",
-                             isPrivate);
+                    getBot().send(sender,
+                                  Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
+                                  + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
+                                  + Utils.bold(message.getId()) + ", QUEUED]",
+                                  isPrivate);
                 }
 
-                bot.send(sender, Utils.helpIndent(message.getMessage()), isPrivate);
+                getBot().send(sender, Utils.helpIndent(message.getMessage()), isPrivate);
             }
         }
 
         if (!hasMessage) {
-            bot.send(sender, "You have no messages in the queue.", isPrivate);
+            getBot().send(sender, "You have no messages in the queue.", isPrivate);
         } else {
-            bot.send(sender, "To delete one or all delivered messages:", isPrivate);
-            bot.send(sender,
-                     Utils.helpIndent(Utils.helpFormat(
-                             "%c " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|" + TELL_ALL_KEYWORD + '>',
-                             bot.getNick(),
-                             isPrivate)),
-                     isPrivate);
-            bot.send(sender,
-                     "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
-                     isPrivate);
+            getBot().send(sender, "To delete one or all delivered messages:", isPrivate);
+            getBot().send(sender,
+                          Utils.helpIndent(Utils.helpFormat(
+                                  "%c " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|" + TELL_ALL_KEYWORD + '>',
+                                  getBot().getNick(),
+                                  isPrivate)),
+                          isPrivate);
+            getBot().send(sender,
+                          "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
+                          isPrivate);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
index 5b70957..f8483af 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
@@ -50,21 +50,24 @@ import java.util.concurrent.ConcurrentHashMap;
  * @since 1.0
  */
 public abstract class AbstractModule {
+    final Mobibot bot;
     final List<String> commands = new ArrayList<>();
     final List<String> help = new ArrayList<>();
     final Map<String, String> properties = new ConcurrentHashMap<>();
 
+    AbstractModule(final Mobibot bot) {
+        this.bot = bot;
+    }
+
     /**
      * Responds to a command.
      *
-     * @param bot       The bot's instance.
      * @param sender    The sender.
      * @param cmd       The command.
      * @param args      The command arguments.
      * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
      */
-    public abstract void commandResponse(final Mobibot bot,
-                                         final String sender,
+    public abstract void commandResponse(final String sender,
                                          final String cmd,
                                          final String args,
                                          final boolean isPrivate);
@@ -99,16 +102,26 @@ public abstract class AbstractModule {
     /**
      * Responds with the module's help.
      *
-     * @param bot       The bot's instance.
      * @param sender    The sender.
      * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
      */
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+    public void helpResponse(final String sender, final boolean isPrivate) {
         for (final String h : help) {
             bot.send(sender, Utils.helpFormat(h, bot.getNick(), isPrivateMsgEnabled() && isPrivate), isPrivate);
         }
     }
 
+    /**
+     * Initializes the properties.
+     *
+     * @param keys The properties keys to initialize.
+     */
+    public void initProperties(final String... keys) {
+        for (final String key : keys) {
+            properties.put(key, "");
+        }
+    }
+
     /**
      * Returns <code>true</code> if the module is enabled.
      *
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
index 400ecdb..862711f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
@@ -54,8 +54,8 @@ public class Calc extends AbstractModule {
     /**
      * The default constructor.
      */
-    public Calc() {
-        super();
+    public Calc(final Mobibot bot) {
+        super(bot);
 
         commands.add(CALC_CMD);
 
@@ -86,15 +86,14 @@ public class Calc extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(final Mobibot bot,
-                                final String sender,
+    public void commandResponse(final String sender,
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
         if (StringUtils.isNotBlank(args)) {
             bot.send(calc(args));
         } else {
-            helpResponse(bot, sender, isPrivate);
+            helpResponse(sender, isPrivate);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
index c6c3fce..f2dd205 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
@@ -82,8 +82,8 @@ public final class CurrencyConverter extends ThreadedModule {
     /**
      * Creates a new {@link CurrencyConverter} instance.
      */
-    public CurrencyConverter() {
-        super();
+    public CurrencyConverter(final Mobibot bot) {
+        super(bot);
 
         commands.add(CURRENCY_CMD);
     }
@@ -180,8 +180,7 @@ public final class CurrencyConverter extends ThreadedModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(final Mobibot bot,
-                                final String sender,
+    public void commandResponse(final String sender,
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
@@ -191,7 +190,7 @@ public final class CurrencyConverter extends ThreadedModule {
             }
         }
 
-        super.commandResponse(bot, sender, cmd, args, isPrivate);
+        super.commandResponse(sender, cmd, args, isPrivate);
     }
 
     /**
@@ -199,7 +198,7 @@ public final class CurrencyConverter extends ThreadedModule {
      */
     @SuppressFBWarnings("REDOS")
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String query, final boolean isPrivate) {
+    void run(final String sender, final String cmd, final String query, final boolean isPrivate) {
         if (EXCHANGE_RATES.isEmpty()) {
             try {
                 loadRates();
@@ -214,13 +213,13 @@ public final class CurrencyConverter extends ThreadedModule {
             final Message msg = convertCurrency(query);
             bot.send(sender, msg);
             if (msg.isError()) {
-                helpResponse(bot, sender, isPrivate);
+                helpResponse(sender, isPrivate);
             }
         } else if (query.contains(CURRENCY_RATES_KEYWORD)) {
             bot.send(sender, "The currency rates for " + Utils.bold(pubDate) + " are:", isPrivate);
             bot.sendList(sender, currencyRates(), 3, isPrivate, false);
         } else {
-            helpResponse(bot, sender, isPrivate);
+            helpResponse(sender, isPrivate);
         }
     }
 
@@ -228,7 +227,7 @@ public final class CurrencyConverter extends ThreadedModule {
      * {@inheritDoc}
      */
     @Override
-    public void helpResponse(final Mobibot bot, final String sender, final boolean isPrivate) {
+    public void helpResponse(final String sender, final boolean isPrivate) {
         if (EXCHANGE_RATES.isEmpty()) {
             try {
                 loadRates();
@@ -241,14 +240,12 @@ public final class CurrencyConverter extends ThreadedModule {
         } else {
             bot.send(sender, "To convert from one currency to another:", isPrivate);
             bot.send(sender,
-                     Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + " 100 USD to EUR",
-                                                       bot.getNick(),
-                                                       isPrivate)), isPrivate);
+                     Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + " 100 USD to EUR", bot.getNick(), false)),
+                     isPrivate);
             bot.send(sender, "For a listing of current rates:", isPrivate);
             bot.send(sender,
                      Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + ' ' + CURRENCY_RATES_KEYWORD,
-                                                       bot.getNick(),
-                                                       isPrivate)), isPrivate);
+                                                       bot.getNick(), false)), isPrivate);
             bot.send(sender, "The supported currencies are: ", isPrivate);
             bot.sendList(sender, new ArrayList<>(EXCHANGE_RATES.keySet()), 11, isPrivate, false);
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
index 26ad7ef..861a244 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
@@ -53,8 +53,8 @@ public final class Dice extends AbstractModule {
     /**
      * The default constructor.
      */
-    public Dice() {
-        super();
+    public Dice(final Mobibot bot) {
+        super(bot);
 
         commands.add(DICE_CMD);
 
@@ -66,8 +66,7 @@ public final class Dice extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(final Mobibot bot,
-                                final String sender,
+    public void commandResponse(final String sender,
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
index 0f64d0c..bc05a1f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
@@ -70,16 +70,15 @@ public final class GoogleSearch extends ThreadedModule {
     /**
      * Creates a new {@link GoogleSearch} instance.
      */
-    public GoogleSearch() {
-        super();
+    public GoogleSearch(final Mobibot bot) {
+        super(bot);
 
         commands.add(GOOGLE_CMD);
 
         help.add("To search Google:");
         help.add(Utils.helpIndent("%c " + GOOGLE_CMD + " <query>"));
 
-        properties.put(GOOGLE_API_KEY_PROP, "");
-        properties.put(GOOGLE_CSE_KEY_PROP, "");
+        initProperties(GOOGLE_API_KEY_PROP, GOOGLE_CSE_KEY_PROP);
     }
 
     /**
@@ -146,7 +145,7 @@ public final class GoogleSearch extends ThreadedModule {
      * Searches Google.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String query, final boolean isPrivate) {
+    void run(final String sender, final String cmd, final String query, final boolean isPrivate) {
         if (StringUtils.isNotBlank(query)) {
             try {
                 final List<Message> results = searchGoogle(query, properties.get(GOOGLE_API_KEY_PROP),
@@ -159,7 +158,7 @@ public final class GoogleSearch extends ThreadedModule {
                 bot.send(sender, e.getMessage(), isPrivate);
             }
         } else {
-            helpResponse(bot, sender, isPrivate);
+            helpResponse(sender, isPrivate);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
index cc24afa..00d1076 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
@@ -61,8 +61,8 @@ public final class Joke extends ThreadedModule {
     /**
      * Creates a new {@link Joke} instance.
      */
-    public Joke() {
-        super();
+    public Joke(final Mobibot bot) {
+        super(bot);
 
         commands.add(JOKE_CMD);
 
@@ -104,19 +104,18 @@ public final class Joke extends ThreadedModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(final Mobibot bot,
-                                final String sender,
+    public void commandResponse(final String sender,
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
-        new Thread(() -> run(bot, sender, cmd, args, isPrivate)).start();
+        new Thread(() -> run(sender, cmd, args, isPrivate)).start();
     }
 
     /**
      * Returns a random joke from <a href="http://www.icndb.com/">The Internet Chuck Norris Database</a>.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String arg, final boolean isPrivate) {
+    void run(final String sender, final String cmd, final String arg, final boolean isPrivate) {
         try {
             bot.send(Utils.cyan(randomJoke().getText()));
         } catch (ModuleException e) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
index a065068..f97284d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
@@ -60,8 +60,8 @@ public final class Lookup extends AbstractModule {
     /**
      * The default constructor.
      */
-    public Lookup() {
-        super();
+    public Lookup(final Mobibot bot) {
+        super(bot);
 
         commands.add(LOOKUP_CMD);
 
@@ -151,8 +151,7 @@ public final class Lookup extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(final Mobibot bot,
-                                final String sender,
+    public void commandResponse(final String sender,
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
@@ -188,7 +187,7 @@ public final class Lookup extends AbstractModule {
                 }
             }
         } else {
-            helpResponse(bot, sender, true);
+            helpResponse(sender, true);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
index ae1f518..2e10363 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
@@ -72,8 +72,8 @@ public class Ping extends AbstractModule {
     /**
      * The default constructor.
      */
-    public Ping() {
-        super();
+    public Ping(final Mobibot bot) {
+        super(bot);
 
         commands.add(PING_CMD);
 
@@ -85,8 +85,7 @@ public class Ping extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(final Mobibot bot,
-                                final String sender,
+    public void commandResponse(final String sender,
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 7374fa8..68bf1e3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -43,7 +43,7 @@ import kotlin.random.Random
 /**
  * Simple module example in Kotlin.
  */
-class RockPaperScissors : AbstractModule() {
+class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
     init {
         with(commands) {
             add(Hands.ROCK.name.toLowerCase())
@@ -96,22 +96,21 @@ class RockPaperScissors : AbstractModule() {
         }
     }
 
-    override fun commandResponse(bot: Mobibot, sender: String, cmd: String, args: String?, isPrivate: Boolean) {
+    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)]
         when {
             hand == botHand -> {
-                bot.action("${green(hand.name)} vs. ${green(botHand.name)} ~ The game is tied ~")
+                bot.send("${green(hand.name)} vs. ${green(botHand.name)}")
+                bot.action("tied.")
             }
             hand.beats(botHand) -> {
-                bot.action(
-                    "${green(hand.name)} ${bold(hand.action)} ${red(botHand.name)} ~ You win ~"
-                )
+                bot.send("${green(hand.name)} ${bold(hand.action)} ${red(botHand.name)}")
+                bot.action("lost.")
             }
             else -> {
-                bot.action(
-                    "${green(botHand.name)} ${bold(botHand.action)} ${red(hand.name)} ~ You lose ~"
-                )
+                bot.send("${green(botHand.name)} ${bold(botHand.action)} ${red(hand.name)}")
+                bot.action("wins.")
             }
         }
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
index 210d907..03b6ebb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
@@ -76,14 +76,14 @@ public final class StockQuote extends ThreadedModule {
     /**
      * Creates a new {@link StockQuote} instance.
      */
-    public StockQuote() {
-        super();
+    public StockQuote(final Mobibot bot) {
+        super(bot);
         commands.add(STOCK_CMD);
 
         help.add("To retrieve a stock quote:");
         help.add(Utils.helpIndent("%c " + STOCK_CMD + " <symbol|keywords>"));
 
-        properties.put(ALPHAVANTAGE_API_KEY_PROP, "");
+        initProperties(ALPHAVANTAGE_API_KEY_PROP);
     }
 
     @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
@@ -208,7 +208,7 @@ public final class StockQuote extends ThreadedModule {
      * Returns the specified stock quote from Alpha Avantage.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String symbol, final boolean isPrivate) {
+    void run(final String sender, final String cmd, final String symbol, final boolean isPrivate) {
         if (StringUtils.isNotBlank(symbol)) {
             try {
                 final List<Message> messages = getQuote(symbol, properties.get(ALPHAVANTAGE_API_KEY_PROP));
@@ -220,7 +220,7 @@ public final class StockQuote extends ThreadedModule {
                 bot.send(e.getMessage());
             }
         } else {
-            helpResponse(bot, sender, isPrivate);
+            helpResponse(sender, isPrivate);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java
index 6bdc29f..11d3cec 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java
@@ -42,27 +42,26 @@ import net.thauvin.erik.mobibot.Mobibot;
  * @since 1.0
  */
 public abstract class ThreadedModule extends AbstractModule {
-    /**
-     * {@inheritDoc}
-     */
+    ThreadedModule(final Mobibot bot) {
+        super(bot);
+    }
+
     @Override
-    public void commandResponse(final Mobibot bot,
-                                final String sender,
+    public void commandResponse(final String sender,
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
         if (isEnabled() && args.length() > 0) {
-            new Thread(() -> run(bot, sender, cmd, args, isPrivate)).start();
+            new Thread(() -> run(sender, cmd, args, isPrivate)).start();
         } else {
-            helpResponse(bot, sender, isPrivate);
+            helpResponse(sender, isPrivate);
         }
     }
 
     /**
      * Runs the thread.
      */
-    abstract void run(Mobibot bot,
-                      String sender,
+    abstract void run(String sender,
                       @SuppressWarnings("unused") String cmd,
                       String args,
                       boolean isPrivate);
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index 0ef6f15..5f47ef9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -32,15 +32,27 @@
 
 package net.thauvin.erik.mobibot.modules;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.thauvin.erik.mobibot.Constants;
 import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.ReleaseInfo;
+import net.thauvin.erik.mobibot.TwitterTimer;
 import net.thauvin.erik.mobibot.Utils;
+import net.thauvin.erik.mobibot.commands.links.UrlMgr;
+import net.thauvin.erik.mobibot.entries.EntryLink;
 import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.NoticeMessage;
+import org.apache.commons.lang3.StringUtils;
 import twitter4j.DirectMessage;
 import twitter4j.Status;
 import twitter4j.TwitterFactory;
 import twitter4j.conf.ConfigurationBuilder;
 
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
 /**
  * The Twitter module.
  *
@@ -50,28 +62,31 @@ import twitter4j.conf.ConfigurationBuilder;
  */
 public final class Twitter extends ThreadedModule {
     // Property keys
+    static final String AUTOPOST_PROP = "twitter-auto-post";
     static final String CONSUMER_KEY_PROP = "twitter-consumerKey";
     static final String CONSUMER_SECRET_PROP = "twitter-consumerSecret";
+    static final String HANDLE_PROP = "twitter-handle";
     static final String TOKEN_PROP = "twitter-token";
     static final String TOKEN_SECRET_PROP = "twitter-tokenSecret";
     // Twitter command
     private static final String TWITTER_CMD = "twitter";
 
+    // Twitter auto-posts.
+    private final Set<Integer> entries = new HashSet<>();
+
     /**
      * Creates a new {@link Twitter} instance.
      */
-    public Twitter() {
-        super();
+    public Twitter(final Mobibot bot) {
+        super(bot);
 
         commands.add(TWITTER_CMD);
 
         help.add("To post to Twitter:");
         help.add(Utils.helpIndent("%c " + TWITTER_CMD + " <message>"));
 
-        properties.put(CONSUMER_SECRET_PROP, "");
-        properties.put(CONSUMER_KEY_PROP, "");
-        properties.put(TOKEN_PROP, "");
-        properties.put(TOKEN_SECRET_PROP, "");
+        properties.put(AUTOPOST_PROP, "false");
+        initProperties(CONSUMER_KEY_PROP,CONSUMER_SECRET_PROP,HANDLE_PROP,TOKEN_PROP,TOKEN_SECRET_PROP);
     }
 
     /**
@@ -115,6 +130,70 @@ public final class Twitter extends ThreadedModule {
         }
     }
 
+    /**
+     * Add an entry to be posted on Twitter.
+     *
+     * @param index The entry index.
+     */
+    public final void addEntry(final int index) {
+        entries.add(index);
+    }
+
+    public final int entriesCount() {
+        return entries.size();
+    }
+
+    public String getHandle() {
+        return properties.get(HANDLE_PROP);
+    }
+
+    public final boolean hasEntry(final int index) {
+        return entries.contains(index);
+    }
+
+    public boolean isAutoPost() {
+        return isEnabled() && Boolean.parseBoolean(properties.get(AUTOPOST_PROP));
+    }
+
+    @Override
+    boolean isValidProperties() {
+        for (final String s : getPropertyKeys()) {
+            if (!AUTOPOST_PROP.equals(s) && !HANDLE_PROP.equals(s) && StringUtils.isBlank(properties.get(s))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Send a notification to the registered Twitter handle.
+     *
+     * @param msg The twitter message.
+     */
+    public final void notification(final String msg) {
+        if (isEnabled() && isNotBlank(getHandle())) {
+            new Thread(() -> {
+                try {
+                    post(String.format(msg, bot.getName(), ReleaseInfo.VERSION, bot.getChannel()), true);
+                } catch (ModuleException e) {
+                    bot.getLogger().warn("Failed to notify @{}: {}", getHandle(), msg, e);
+                }
+            }).start();
+        }
+    }
+
+    /**
+     * Posts on Twitter.
+     *
+     * @param message The message to post.
+     * @param isDm    The direct message flag.
+     * @throws ModuleException If an error occurs while posting.
+     */
+    public void post(final String message, final boolean isDm)
+            throws ModuleException {
+        post(properties.get(HANDLE_PROP), message, isDm);
+    }
+
     /**
      * Posts on Twitter.
      *
@@ -135,11 +214,48 @@ public final class Twitter extends ThreadedModule {
                            isDm);
     }
 
+    /**
+     * Post an entry to twitter.
+     *
+     * @param index The post entry index.
+     */
+    @SuppressFBWarnings("SUI_CONTAINS_BEFORE_REMOVE")
+    public final void postEntry(final int index) {
+        if (isAutoPost() && hasEntry(index) && UrlMgr.getEntriesCount() >= index) {
+            final EntryLink entry = UrlMgr.getEntry(index);
+            final String msg =
+                    entry.getTitle() + ' ' + entry.getLink() + " via " + entry.getNick() + " on " + bot.getChannel();
+            new Thread(() -> {
+                try {
+                    if (bot.getLogger().isDebugEnabled()) {
+                        bot.getLogger().debug("Posting {}{} to Twitter.", Constants.LINK_CMD, index + 1);
+                    }
+                    post(msg, false);
+                } catch (ModuleException e) {
+                    bot.getLogger().warn("Failed to post entry on Twitter.", e);
+                }
+            }).start();
+            removeEntry(index);
+        }
+    }
+
+    public void queueEntry(final int index) {
+        if (isAutoPost()) {
+            addEntry(index);
+            bot.getLogger().debug("Scheduling ${Constants.LINK_CMD}${index + 1} for posting on Twitter.");
+            bot.getTimer().schedule(new TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L);
+        }
+    }
+
+    public final void removeEntry(final int index) {
+        entries.remove(index);
+    }
+
     /**
      * Posts to twitter.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String message, final boolean isPrivate) {
+    void run(final String sender, final String cmd, final String message, final boolean isPrivate) {
         try {
             bot.send(sender,
                      post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getText(),
@@ -149,4 +265,13 @@ public final class Twitter extends ThreadedModule {
             bot.send(sender, e.getMessage(), isPrivate);
         }
     }
+
+    /**
+     * Post all the entries to Twitter on shutdown.
+     */
+    public final void shutdown() {
+        for (final int index : entries) {
+            postEntry(index);
+        }
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index bf089fb..b1be81e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -58,8 +58,8 @@ public final class War extends AbstractModule {
     /**
      * The default constructor.
      */
-    public War() {
-        super();
+    public War(final Mobibot bot) {
+        super(bot);
 
         commands.add(WAR_CMD);
 
@@ -71,8 +71,7 @@ public final class War extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(final Mobibot bot,
-                                final String sender,
+    public void commandResponse(final String sender,
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
index 4d58090..a0894d0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
@@ -73,8 +73,8 @@ public class Weather2 extends ThreadedModule {
     /**
      * Creates a new {@link Weather2} instance.
      */
-    public Weather2() {
-        super();
+    public Weather2(final Mobibot bot) {
+        super(bot);
 
         commands.add(WEATHER_CMD);
 
@@ -84,7 +84,7 @@ public class Weather2 extends ThreadedModule {
         help.add(Utils.helpIndent("%c " + WEATHER_CMD + " paris, fr"));
         help.add("The default ISO 3166 country code is " + bold("US") + ". Zip codes supported in most countries.");
 
-        properties.put(OWM_API_KEY_PROP, "");
+        initProperties(OWM_API_KEY_PROP);
     }
 
     private static OWM.Country getCountry(final String countryCode) {
@@ -218,12 +218,12 @@ public class Weather2 extends ThreadedModule {
      * Fetches the weather data from a specific city.
      */
     @Override
-    void run(final Mobibot bot, final String sender, final String cmd, final String args, final boolean isPrivate) {
+    void run(final String sender, final String cmd, final String args, final boolean isPrivate) {
         if (StringUtils.isNotBlank(args)) {
             try {
                 final List<Message> messages = getWeather(args, properties.get(OWM_API_KEY_PROP));
                 if (messages.get(0).isError()) {
-                    helpResponse(bot, sender, isPrivate);
+                    helpResponse(sender, isPrivate);
                 } else {
                     for (final Message msg : messages) {
                         bot.send(sender, msg);
@@ -234,7 +234,7 @@ public class Weather2 extends ThreadedModule {
                 bot.send(e.getMessage());
             }
         } else {
-            helpResponse(bot, sender, isPrivate);
+            helpResponse(sender, isPrivate);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
index 2eaa86c..48092d8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
@@ -63,9 +63,7 @@ public final class WorldTime extends AbstractModule {
     // Supported countries
     private static final Map<String, String> COUNTRIES_MAP;
 
-    /**
-     * The time command.
-     */
+    // The Time command
     private static final String TIME_CMD = "time";
 
     static {
@@ -157,8 +155,8 @@ public final class WorldTime extends AbstractModule {
     /**
      * Creates a new {@link WorldTime} instance.
      */
-    public WorldTime() {
-        super();
+    public WorldTime(final Mobibot bot) {
+        super(bot);
 
         help.add("To display a country's current date/time:");
         help.add(Utils.helpIndent("%c " + TIME_CMD) + " [<country code>]");
@@ -218,8 +216,7 @@ public final class WorldTime extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(final Mobibot bot,
-                                final String sender,
+    public void commandResponse(final String sender,
                                 final String cmd,
                                 final String args,
                                 final boolean isPrivate) {
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
index c108282..2f9b21e 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
@@ -55,6 +55,6 @@ public class CalcTest {
 
     @Test
     public void testCalcImpl() {
-        AbstractModuleTest.testAbstractModule(new Calc());
+        AbstractModuleTest.testAbstractModule(new Calc(null));
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
index f72d74a..f1b410a 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
@@ -68,6 +68,6 @@ public class CurrencyConverterTest {
 
     @Test
     public void testCurrencyConvertererImpl() {
-        AbstractModuleTest.testAbstractModule(new CurrencyConverter());
+        AbstractModuleTest.testAbstractModule(new CurrencyConverter(null));
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
index 23a1552..0d8a5f9 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
@@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 public class GoogleSearchTest extends LocalProperties {
     @Test
     public void testGoogleSearchImpl() {
-        AbstractModuleTest.testAbstractModule(new GoogleSearch());
+        AbstractModuleTest.testAbstractModule(new GoogleSearch(null));
     }
 
     @SuppressFBWarnings("LEST_LOST_EXCEPTION_STACK_TRACE")
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
index 93836e7..df6ddc7 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
@@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class JokeTest {
     @Test
     public void testJokeImpl() {
-        AbstractModuleTest.testAbstractModule(new Joke());
+        AbstractModuleTest.testAbstractModule(new Joke(null));
     }
 
     @Test
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.java
index d0d55f5..6b1b7c4 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.java
@@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class LookupTest {
     @Test
     public void testLookupImpl() {
-        AbstractModuleTest.testAbstractModule(new Lookup());
+        AbstractModuleTest.testAbstractModule(new Lookup(null));
     }
 
     @Test
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.java
index 8dc6c8e..564f111 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.java
@@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class PingTest {
     @Test
     public void testPingImpl() {
-        AbstractModuleTest.testAbstractModule(new Ping());
+        AbstractModuleTest.testAbstractModule(new Ping(null));
     }
 
     @Test
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
index 0b77df5..2eec2a0 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
@@ -84,6 +84,6 @@ public class StockQuoteTest extends LocalProperties {
 
     @Test
     public void testStockQuoteImpl() {
-        AbstractModuleTest.testAbstractModule(new StockQuote());
+        AbstractModuleTest.testAbstractModule(new StockQuote(null));
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
index f289a79..04cf36c 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
@@ -33,7 +33,6 @@
 package net.thauvin.erik.mobibot.modules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Constants;
 import org.testng.annotations.Test;
 
 import java.net.InetAddress;
@@ -72,7 +71,7 @@ public class TwitterTest extends LocalProperties {
                 getProperty(Twitter.CONSUMER_SECRET_PROP),
                 getProperty(Twitter.TOKEN_PROP),
                 getProperty(Twitter.TOKEN_SECRET_PROP),
-                getProperty(Constants.TWITTER_HANDLE_PROP),
+                getProperty(Twitter.HANDLE_PROP),
                 msg,
                 true).getText()).as("twitterPost(" + msg + ')').isEqualTo(msg);
     }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
index 5eb40d4..0c1309e 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
@@ -74,6 +74,6 @@ public class Weather2Test extends LocalProperties {
 
     @Test
     public void testWeather2Impl() {
-        AbstractModuleTest.testAbstractModule(new Weather2());
+        AbstractModuleTest.testAbstractModule(new Weather2(null));
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
index 6d6e630..9c7299a 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
@@ -54,6 +54,6 @@ public class WordTimeTest {
 
     @Test
     public void testWorldTimeImpl() {
-        AbstractModuleTest.testAbstractModule(new Lookup());
+        AbstractModuleTest.testAbstractModule(new Lookup(null));
     }
 }
diff --git a/version.properties b/version.properties
index 6e5c59b..46bdf8b 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Thu Apr 16 16:00:41 PDT 2020
-version.buildmeta=294
+#Tue Apr 28 20:58:04 PDT 2020
+version.buildmeta=348
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=alpha
 version.project=mobibot
-version.semver=0.8.0-alpha+294
+version.semver=0.8.0-alpha+348

From 6787b0dcbe74d8b188f49946390597cbd590e5a1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 29 Apr 2020 11:51:22 -0700
Subject: [PATCH 046/262] Updated PMD version.

---
 .idea/mobibot.iml              | 2 +-
 .idea/modules/mobibot.main.iml | 2 +-
 .idea/modules/mobibot.test.iml | 2 +-
 build.gradle                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 94b4d4b..8c4120d 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+330" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+349" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index beb8f3c..13a7f5b 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+330" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+349" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index b33ac37..ece1a8b 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+330" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+349" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/build.gradle b/build.gradle
index 693e640..0a7ea7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,7 +104,7 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
 }
 
 pmd {
-    toolVersion = '6.22.0'
+    toolVersion = '6.23.0'
     ignoreFailures = true
     ruleSets = []
     ruleSetFiles = files("${projectDir}/config/pmd.xml")

From 1a5ae72d6e275df8f88e8f4539a9c613b1a4f66a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 29 Apr 2020 11:52:03 -0700
Subject: [PATCH 047/262] Added urlReader() method.

---
 .../java/net/thauvin/erik/mobibot/Utils.java  | 22 +++++++++++++++
 .../erik/mobibot/modules/GoogleSearch.java    | 27 +++++--------------
 .../thauvin/erik/mobibot/modules/Joke.java    | 24 +++--------------
 .../net/thauvin/erik/mobibot/UtilsTest.java   | 16 ++++++++---
 4 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java
index e4f582a..3d0632a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.java
@@ -32,16 +32,23 @@
 
 package net.thauvin.erik.mobibot;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.commons.lang3.StringUtils;
 import org.jibble.pircbot.Colors;
 import org.jsoup.Jsoup;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * Miscellaneous utilities class.
@@ -332,6 +339,21 @@ public final class Utils {
         return info.toString();
     }
 
+    /**
+     * Reads contents of a URL.
+     *
+     * @param url The URL to read.
+     * @return The URL contents.
+     * @throws IOException If an IO error occurs.
+     */
+    @SuppressFBWarnings("SECSSSRFUC")
+    public static String urlReader(final URL url) throws IOException {
+        try (final BufferedReader reader = new BufferedReader(
+                new InputStreamReader(url.openStream(), StandardCharsets.UTF_8))) {
+            return reader.lines().collect(Collectors.joining(System.lineSeparator()));
+        }
+    }
+
     /**
      * Returns the specified date formatted as <code>yyyy-MM-dd HH:mm</code>.
      *
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
index bc05a1f..a36789f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
@@ -42,11 +42,8 @@ import org.jibble.pircbot.Colors;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.net.URL;
-import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -111,25 +108,15 @@ public final class GoogleSearch extends ThreadedModule {
                                 + "&q="
                                 + q
                                 + "&filter=1&num=5&alt=json");
-                final URLConnection conn = url.openConnection();
 
-                final StringBuilder sb = new StringBuilder();
-                try (final BufferedReader reader =
-                             new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        sb.append(line);
-                    }
+                final JSONObject json = new JSONObject(Utils.urlReader(url));
+                final JSONArray ja = json.getJSONArray("items");
 
-                    final JSONObject json = new JSONObject(sb.toString());
-                    final JSONArray ja = json.getJSONArray("items");
-
-                    for (int i = 0; i < ja.length(); i++) {
-                        final JSONObject j = ja.getJSONObject(i);
-                        results.add(new NoticeMessage(Utils.unescapeXml(j.getString("title"))));
-                        results.add(
-                                new NoticeMessage(Utils.helpIndent(j.getString("link"), false), Colors.DARK_GREEN));
-                    }
+                for (int i = 0; i < ja.length(); i++) {
+                    final JSONObject j = ja.getJSONObject(i);
+                    results.add(new NoticeMessage(Utils.unescapeXml(j.getString("title"))));
+                    results.add(
+                            new NoticeMessage(Utils.helpIndent(j.getString("link"), false), Colors.DARK_GREEN));
                 }
             } catch (IOException e) {
                 throw new ModuleException("searchGoogle(" + query + ')', "An error has occurred searching Google.", e);
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
index 00d1076..5c1d858 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
@@ -38,11 +38,7 @@ import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.PublicMessage;
 import org.json.JSONObject;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
 
 /**
  * The Joke module.
@@ -79,22 +75,10 @@ public final class Joke extends ThreadedModule {
     static Message randomJoke() throws ModuleException {
         try {
             final URL url = new URL(JOKE_URL);
-            final URLConnection conn = url.openConnection();
-
-            final StringBuilder sb = new StringBuilder();
-            try (final BufferedReader reader =
-                         new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
-                String line;
-                while ((line = reader.readLine()) != null) {
-                    sb.append(line);
-                }
-
-                final JSONObject json = new JSONObject(sb.toString());
-
-                return new PublicMessage(
-                        json.getJSONObject("value").get("joke").toString().replace("\\'", "'")
-                            .replace("\\\"", "\""));
-            }
+            final JSONObject json = new JSONObject(Utils.urlReader(url));
+            return new PublicMessage(
+                    json.getJSONObject("value").get("joke").toString().replace("\\'", "'")
+                        .replace("\\\"", "\""));
         } catch (Exception e) {
             throw new ModuleException("randomJoke()", "An error has occurred retrieving a random joke.", e);
         }
diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java
index df2ff57..b754fbf 100644
--- a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java
@@ -38,6 +38,8 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.io.File;
+import java.io.IOException;
+import java.net.URL;
 import java.time.LocalDateTime;
 import java.util.Calendar;
 
@@ -52,7 +54,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class UtilsTest {
     private static final String ASCII =
-        " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
+            " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
 
     private final Calendar cal = Calendar.getInstance();
     private final LocalDateTime localDateTime = LocalDateTime.of(1952, 2, 17, 12, 30, 0);
@@ -71,7 +73,7 @@ public class UtilsTest {
     @Test
     public void testColorize() {
         assertThat(Utils.colorize(ASCII, Colors.REVERSE)).as("colorize(reverse)").isEqualTo(
-            Colors.REVERSE + ASCII + Colors.REVERSE);
+                Colors.REVERSE + ASCII + Colors.REVERSE);
         assertThat(Utils.colorize(ASCII, Colors.RED)).as("colorize(red)").isEqualTo(Colors.RED + ASCII + Colors.NORMAL);
         assertThat(Utils.colorize(null, Colors.RED)).as("colorize(null)").isEqualTo(Colors.NORMAL);
     }
@@ -85,7 +87,7 @@ public class UtilsTest {
     public void testEnsureDir() {
         assertThat(Utils.ensureDir("dir", false)).as("ensureDir(dir, false)").isEqualTo("dir" + File.separatorChar);
         assertThat(Utils.ensureDir("https://erik.thauvin.net", true)).as("ensureDir(erik.thauvin.net, true)").isEqualTo(
-            "https://erik.thauvin.net/");
+                "https://erik.thauvin.net/");
     }
 
     @Test
@@ -136,7 +138,7 @@ public class UtilsTest {
     @Test
     public void testUnescapeXml() {
         assertThat(Utils.unescapeXml("&lt;a name=&quot;test &amp; &apos;&#39;&quot;&gt;")).isEqualTo(
-            "<a name=\"test & ''\">");
+                "<a name=\"test & ''\">");
     }
 
     @Test
@@ -144,6 +146,12 @@ public class UtilsTest {
         assertThat("17 years 2 months 2 weeks 1 day 6 hours 45 minutes").isEqualTo(Utils.uptime(547800300076L));
     }
 
+    @Test
+    public void testUrlReader() throws IOException {
+        assertThat(Utils.urlReader(new URL("https://postman-echo.com/status/200"))).as("urlReader()").isEqualTo(
+                "{\"status\":200}");
+    }
+
     @Test
     public void testUtcDateTime() {
         assertThat(Utils.utcDateTime(cal.getTime())).as("utcDateTime(date)").isEqualTo("1952-02-17 12:30");

From 725937bf61c11fd3071b561176b4105433e250c0 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 29 Apr 2020 11:52:28 -0700
Subject: [PATCH 048/262] Cleanup.

---
 src/main/java/net/thauvin/erik/mobibot/FeedReader.java      | 2 +-
 .../net/thauvin/erik/mobibot/modules/CurrencyConverter.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
index cac105e..8c58b09 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
@@ -85,7 +85,7 @@ public class FeedReader implements Runnable {
 
             final List<SyndEntry> items = feed.getEntries();
             if (items.isEmpty()) {
-                bot.send(sender, "There is currently nothing to view. Why don't you post something?", false);
+                bot.send(sender, "There is currently nothing to view.", false);
             } else {
                 SyndEntry item;
                 for (int i = 0; (i < items.size()) && (i < MAX_ITEMS); i++) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
index f2dd205..2794395 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
@@ -240,12 +240,12 @@ public final class CurrencyConverter extends ThreadedModule {
         } else {
             bot.send(sender, "To convert from one currency to another:", isPrivate);
             bot.send(sender,
-                     Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + " 100 USD to EUR", bot.getNick(), false)),
-                     isPrivate);
+                     Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + " 100 USD to EUR",
+                                                       bot.getNick(), isPrivateMsgEnabled())), isPrivate);
             bot.send(sender, "For a listing of current rates:", isPrivate);
             bot.send(sender,
                      Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + ' ' + CURRENCY_RATES_KEYWORD,
-                                                       bot.getNick(), false)), isPrivate);
+                                                       bot.getNick(), isPrivateMsgEnabled())), isPrivate);
             bot.send(sender, "The supported currencies are: ", isPrivate);
             bot.sendList(sender, new ArrayList<>(EXCHANGE_RATES.keySet()), 11, isPrivate, false);
         }

From 8bc04b09403458e62465b7f3597fff8d22d2c86a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 30 Apr 2020 14:51:02 -0700
Subject: [PATCH 049/262] Renamed UrlMgr to LinksMgr.

---
 detekt-baseline.xml                           |  2 +-
 .../net/thauvin/erik/mobibot/Mobibot.java     | 45 ++++++-------------
 .../thauvin/erik/mobibot/commands/AddLog.kt   |  4 +-
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  4 +-
 .../net/thauvin/erik/mobibot/commands/Info.kt |  4 +-
 .../erik/mobibot/commands/links/Comment.kt    | 10 ++---
 .../commands/links/{UrlMgr.kt => LinksMgr.kt} |  2 +-
 .../erik/mobibot/commands/links/Posting.kt    | 28 ++++++------
 .../erik/mobibot/commands/links/Tags.kt       |  6 +--
 .../erik/mobibot/commands/links/View.kt       |  4 +-
 .../erik/mobibot/entries/EntryLink.java       |  4 +-
 .../thauvin/erik/mobibot/modules/Twitter.java |  6 +--
 12 files changed, 50 insertions(+), 69 deletions(-)
 rename src/main/java/net/thauvin/erik/mobibot/commands/links/{UrlMgr.kt => LinksMgr.kt} (99%)

diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index 19a2a8f..d61a8d8 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -14,6 +14,6 @@
     <ID>MagicNumber:View.kt$View$8</ID>
     <ID>NestedBlockDepth:Addons.kt$Addons$add</ID>
     <ID>NestedBlockDepth:Comment.kt$Comment$commandResponse</ID>
-    <ID>NestedBlockDepth:UrlMgr.kt$UrlMgr$commandResponse</ID>
+    <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$commandResponse</ID>
   </Whitelist>
 </SmellBaseline>
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 5911a83..16d09b9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -48,9 +48,9 @@ import net.thauvin.erik.mobibot.commands.Say;
 import net.thauvin.erik.mobibot.commands.Users;
 import net.thauvin.erik.mobibot.commands.Versions;
 import net.thauvin.erik.mobibot.commands.links.Comment;
+import net.thauvin.erik.mobibot.commands.links.LinksMgr;
 import net.thauvin.erik.mobibot.commands.links.Posting;
 import net.thauvin.erik.mobibot.commands.links.Tags;
-import net.thauvin.erik.mobibot.commands.links.UrlMgr;
 import net.thauvin.erik.mobibot.commands.links.View;
 import net.thauvin.erik.mobibot.commands.tell.Tell;
 import net.thauvin.erik.mobibot.entries.EntriesMgr;
@@ -96,6 +96,7 @@ import java.nio.file.Paths;
 import java.util.List;
 import java.util.Properties;
 import java.util.Timer;
+import java.util.regex.Pattern;
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import static org.apache.commons.lang3.StringUtils.lowerCase;
@@ -184,8 +185,8 @@ public class Mobibot extends PircBot {
 
         // Load the current entries and backlogs, if any
         try {
-            UrlMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, ircChannel);
-            LOGGER.debug("Last feed: {}", UrlMgr.getStartDate());
+            LinksMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, ircChannel);
+            LOGGER.debug("Last feed: {}", LinksMgr.getStartDate());
         } catch (Exception e) {
             LOGGER.error("An error occurred while loading the logs.", e);
         }
@@ -228,7 +229,7 @@ public class Mobibot extends PircBot {
         addons.add(new Comment(this), p);
         addons.add(new Posting(this), p);
         addons.add(new Tags(this), p);
-        addons.add(new UrlMgr(this), p);
+        addons.add(new LinksMgr(this), p);
         addons.add(new View(this), p);
 
         // Load the modules
@@ -253,7 +254,7 @@ public class Mobibot extends PircBot {
         addons.sort();
 
         // Save the entries
-        UrlMgr.saveEntries(this, true);
+        LinksMgr.saveEntries(this, true);
     }
 
     /**
@@ -286,20 +287,20 @@ public class Mobibot extends PircBot {
 
         // Parse the command line
         final CommandLineParser parser = new DefaultParser();
-        CommandLine line = null;
+        CommandLine commandLine = null;
 
         try {
-            line = parser.parse(options, args);
+            commandLine = parser.parse(options, args);
         } catch (ParseException e) {
             System.err.println("CLI Parsing failed.  Reason: " + e.getMessage());
             e.printStackTrace(System.err);
             System.exit(1);
         }
 
-        if (line.hasOption(Constants.HELP_ARG.charAt(0))) {
+        if (commandLine.hasOption(Constants.HELP_ARG.charAt(0))) {
             // Output the usage
             new HelpFormatter().printHelp(Mobibot.class.getName(), options);
-        } else if (line.hasOption(Constants.VERSION_ARG.charAt(0))) {
+        } else if (commandLine.hasOption(Constants.VERSION_ARG.charAt(0))) {
             for (final String s : INFO) {
                 System.out.println(s);
             }
@@ -307,7 +308,7 @@ public class Mobibot extends PircBot {
             final Properties p = new Properties();
 
             try (final InputStream fis = Files.newInputStream(
-                    Paths.get(line.getOptionValue(Constants.PROPS_ARG.charAt(0), "./mobibot.properties")))) {
+                    Paths.get(commandLine.getOptionValue(Constants.PROPS_ARG.charAt(0), "./mobibot.properties")))) {
                 // Load the properties files
                 p.load(fis);
             } catch (FileNotFoundException e) {
@@ -325,7 +326,7 @@ public class Mobibot extends PircBot {
             final String logsDir = Utils.ensureDir(p.getProperty("logs", "."), false);
 
             // Redirect the stdout and stderr
-            if (!line.hasOption(Constants.DEBUG_ARG.charAt(0))) {
+            if (!commandLine.hasOption(Constants.DEBUG_ARG.charAt(0))) {
                 try {
                     final PrintStream stdout = new PrintStream(
                             new FileOutputStream(logsDir + channel.substring(1) + '.' + Utils.today() + ".log", true));
@@ -493,26 +494,6 @@ public class Mobibot extends PircBot {
         return addons.getModulesNames();
     }
 
-    /**
-     * Returns the bot's nickname regexp pattern.
-     *
-     * @return The nickname regexp pattern.
-     */
-    private String getNickPattern() {
-        final StringBuilder buff = new StringBuilder(0);
-
-        for (final char c : getNick().toCharArray()) {
-            if (Character.isLetter(c)) {
-                buff.append('[').append(lowerCase(String.valueOf(c))).append(StringUtils.upperCase(String.valueOf(c)))
-                    .append(']');
-            } else {
-                buff.append(c);
-            }
-        }
-
-        return buff.toString();
-    }
-
     /**
      * Returns the Tell command.
      *
@@ -700,7 +681,7 @@ public class Mobibot extends PircBot {
 
         tell.send(sender, true);
 
-        if (message.matches(getNickPattern() + ":.*")) { // mobibot: <command>
+        if (message.matches("(?i)" + Pattern.quote(getNick()) + ":.*")) { // mobibot: <command>
             final String[] cmds = message.substring(message.indexOf(':') + 1).trim().split(" ", 2);
             final String cmd = lowerCase(cmds[0]);
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
index addface..f7639a5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
@@ -33,8 +33,8 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.addHistory
-import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.getHistory
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.addHistory
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.getHistory
 import net.thauvin.erik.mobibot.entries.EntriesMgr
 import java.io.File
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index 2999272..de8d58b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -34,7 +34,7 @@ package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
-import net.thauvin.erik.mobibot.commands.links.UrlMgr
+import net.thauvin.erik.mobibot.commands.links.LinksMgr
 import java.util.*
 
 class Ignore(bot: Mobibot) : AbstractCommand(bot) {
@@ -150,7 +150,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
     override fun setProperty(key: String, value: String) {
         super.setProperty(key, value)
         if (IGNORE_PROP == key) {
-            ignored.addAll(value.split(UrlMgr.LINK_MATCH.toRegex()))
+            ignored.addAll(value.split(LinksMgr.LINK_MATCH.toRegex()))
         }
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
index fc6e546..1698028 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
@@ -34,7 +34,7 @@ package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
-import net.thauvin.erik.mobibot.commands.links.UrlMgr
+import net.thauvin.erik.mobibot.commands.links.LinksMgr
 import java.lang.management.ManagementFactory
 
 class Info(bot: Mobibot) : AbstractCommand(bot) {
@@ -63,7 +63,7 @@ class Info(bot: Mobibot) : AbstractCommand(bot) {
         with(info) {
             append(Utils.uptime(ManagementFactory.getRuntimeMXBean().uptime))
             append(" [Entries: ")
-            append(UrlMgr.entriesCount)
+            append(LinksMgr.entriesCount)
 
             if (isOp) {
                 if (bot.tell.isEnabled()) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 2ecba68..63f5ffa 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -68,8 +68,8 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
         val cmds = args.substring(1).split("[.:]".toRegex(), 3)
         val index = cmds[0].toInt() - 1
 
-        if (index < UrlMgr.entriesCount) {
-            val entry: EntryLink = UrlMgr.getEntry(index)
+        if (index < LinksMgr.entriesCount) {
+            val entry: EntryLink = LinksMgr.getEntry(index)
             val commentIndex = cmds[1].toInt() - 1
             if (commentIndex < entry.commentsCount) {
                 when (val cmd = cmds[2].trim()) {
@@ -124,7 +124,7 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
             val comment = entry.getComment(commentIndex)
             comment.nick = cmd.substring(1)
             bot.send(EntriesUtils.buildComment(index, commentIndex, comment))
-            UrlMgr.saveEntries(bot, false)
+            LinksMgr.saveEntries(bot, false)
         } else {
             bot.send(sender, "Please ask a channel op to change the author of this comment for you.", false)
         }
@@ -141,7 +141,7 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
         if (isOp || sender == entry.getComment(commentIndex).nick) {
             entry.deleteComment(commentIndex)
             bot.send("Comment ${Constants.LINK_CMD}${index + 1}.${commentIndex + 1} removed.")
-            UrlMgr.saveEntries(bot, false)
+            LinksMgr.saveEntries(bot, false)
         } else {
             bot.send(sender, "Please ask a channel op to delete this comment for you.", false)
         }
@@ -151,7 +151,7 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
         entry.setComment(commentIndex, cmd, sender)
         val comment = entry.getComment(commentIndex)
         bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment), false)
-        UrlMgr.saveEntries(bot, false)
+        LinksMgr.saveEntries(bot, false)
     }
 
     private fun showComment(bot: Mobibot, entry: EntryLink, index: Int, commentIndex: Int) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
similarity index 99%
rename from src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
rename to src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index 5a914a4..f4213d4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/UrlMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -43,7 +43,7 @@ import net.thauvin.erik.mobibot.entries.EntryLink
 import org.jsoup.Jsoup
 import java.io.IOException
 
-class UrlMgr(bot: Mobibot) : AbstractCommand(bot) {
+class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
     private val keywords: MutableList<String> = ArrayList()
     private val defaultTags: MutableList<String> = ArrayList()
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 42e7e4d..26a74ce 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -67,7 +67,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
         val cmds = args.substring(1).split(":", limit = 2)
         val index = cmds[0].toInt() - 1
 
-        if (index < UrlMgr.entriesCount) {
+        if (index < LinksMgr.entriesCount) {
             when (val cmd = cmds[1].trim()) {
                 "" -> showEntry(index)
                 "-" -> removeEntry(sender, login, isOp, index) // L1:-
@@ -88,33 +88,33 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun addComment(cmd: String, sender: String, index: Int) {
-        val entry: EntryLink = UrlMgr.getEntry(index)
+        val entry: EntryLink = LinksMgr.getEntry(index)
         val commentIndex = entry.addComment(cmd, sender)
         val comment = entry.getComment(commentIndex)
         bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment), false)
-        UrlMgr.saveEntries(bot, false)
+        LinksMgr.saveEntries(bot, false)
     }
 
     private fun changeTitle(cmd: String, index: Int) {
         if (cmd.length > 1) {
-            val entry: EntryLink = UrlMgr.getEntry(index)
+            val entry: EntryLink = LinksMgr.getEntry(index)
             entry.title = cmd.substring(1).trim()
             bot.updatePin(entry.link, entry)
             bot.send(EntriesUtils.buildLink(index, entry))
-            UrlMgr.saveEntries(bot, false)
+            LinksMgr.saveEntries(bot, false)
         }
     }
 
     private fun changeUrl(cmd: String, login: String, isOp: Boolean, index: Int) {
-        val entry: EntryLink = UrlMgr.getEntry(index)
+        val entry: EntryLink = LinksMgr.getEntry(index)
         if (entry.login == login || isOp) {
             val link = cmd.substring(1)
-            if (link.matches(UrlMgr.LINK_MATCH.toRegex())) {
+            if (link.matches(LinksMgr.LINK_MATCH.toRegex())) {
                 val oldLink = entry.link
                 entry.link = link
                 bot.updatePin(oldLink, entry)
                 bot.send(EntriesUtils.buildLink(index, entry))
-                UrlMgr.saveEntries(bot, false)
+                LinksMgr.saveEntries(bot, false)
             }
         }
     }
@@ -122,10 +122,10 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     private fun changeAuthor(cmd: String, sender: String, isOp: Boolean, index: Int) {
         if (isOp) {
             if (cmd.length > 1) {
-                val entry: EntryLink = UrlMgr.getEntry(index)
+                val entry: EntryLink = LinksMgr.getEntry(index)
                 entry.nick = cmd.substring(1)
                 bot.send(EntriesUtils.buildLink(index, entry))
-                UrlMgr.saveEntries(bot, false)
+                LinksMgr.saveEntries(bot, false)
             }
         } else {
             bot.send(sender, "Please ask a channel op to change the author of this link for you.", false)
@@ -133,19 +133,19 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun removeEntry(sender: String, login: String, isOp: Boolean, index: Int) {
-        val entry: EntryLink = UrlMgr.getEntry(index)
+        val entry: EntryLink = LinksMgr.getEntry(index)
         if (entry.login == login || isOp) {
             bot.deletePin(index, entry)
-            UrlMgr.removeEntry(index)
+            LinksMgr.removeEntry(index)
             bot.send("Entry ${Constants.LINK_CMD}${index + 1} removed.")
-            UrlMgr.saveEntries(bot, false)
+            LinksMgr.saveEntries(bot, false)
         } else {
             bot.send(sender, "Please ask a channel op to remove this entry for you.", false)
         }
     }
 
     private fun showEntry(index: Int) {
-        val entry: EntryLink = UrlMgr.getEntry(index)
+        val entry: EntryLink = LinksMgr.getEntry(index)
         bot.send(EntriesUtils.buildLink(index, entry))
         if (entry.hasTags()) {
             bot.send(EntriesUtils.buildTags(index, entry))
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
index 511ca46..a313b01 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -63,15 +63,15 @@ class Tags(bot: Mobibot) : AbstractCommand(bot) {
         val cmds = args.substring(1).split("T:", limit = 2)
         val index = cmds[0].toInt() - 1
 
-        if (index < UrlMgr.entriesCount) {
+        if (index < LinksMgr.entriesCount) {
             val cmd = cmds[1].trim()
-            val entry: EntryLink = UrlMgr.getEntry(index)
+            val entry: EntryLink = LinksMgr.getEntry(index)
             if (cmd.isNotEmpty()) {
                 if (entry.login == login || isOp) {
                     entry.setTags(cmd)
                     bot.updatePin(entry.link, entry)
                     bot.send(EntriesUtils.buildTags(index, entry))
-                    UrlMgr.saveEntries(bot, false)
+                    LinksMgr.saveEntries(bot, false)
                 } else {
                     bot.send(sender, "Please ask a channel op to change the tags for you.",isPrivate)
                 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index 329b190..98dd423 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -35,8 +35,8 @@ package net.thauvin.erik.mobibot.commands.links
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.AbstractCommand
-import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.entriesCount
-import net.thauvin.erik.mobibot.commands.links.UrlMgr.Companion.getEntry
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entriesCount
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.getEntry
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
index aaa09cf..ba9a3f5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
@@ -35,7 +35,7 @@ package net.thauvin.erik.mobibot.entries;
 import com.rometools.rome.feed.synd.SyndCategory;
 import com.rometools.rome.feed.synd.SyndCategoryImpl;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.commands.links.UrlMgr;
+import net.thauvin.erik.mobibot.commands.links.LinksMgr;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
@@ -347,7 +347,7 @@ public class EntryLink implements Serializable {
      * @param tags The space-delimited tags.
      */
     public final void setTags(final String tags) {
-        setTags(Arrays.asList(tags.split(UrlMgr.TAG_MATCH)));
+        setTags(Arrays.asList(tags.split(LinksMgr.TAG_MATCH)));
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index 5f47ef9..7264694 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -38,7 +38,7 @@ import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.ReleaseInfo;
 import net.thauvin.erik.mobibot.TwitterTimer;
 import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.commands.links.UrlMgr;
+import net.thauvin.erik.mobibot.commands.links.LinksMgr;
 import net.thauvin.erik.mobibot.entries.EntryLink;
 import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.NoticeMessage;
@@ -221,8 +221,8 @@ public final class Twitter extends ThreadedModule {
      */
     @SuppressFBWarnings("SUI_CONTAINS_BEFORE_REMOVE")
     public final void postEntry(final int index) {
-        if (isAutoPost() && hasEntry(index) && UrlMgr.getEntriesCount() >= index) {
-            final EntryLink entry = UrlMgr.getEntry(index);
+        if (isAutoPost() && hasEntry(index) && LinksMgr.getEntriesCount() >= index) {
+            final EntryLink entry = LinksMgr.getEntry(index);
             final String msg =
                     entry.getTitle() + ' ' + entry.getLink() + " via " + entry.getNick() + " on " + bot.getChannel();
             new Thread(() -> {

From b55bfb45b7728a8d2edebd05d3795e9a00e0805b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 30 Apr 2020 18:18:42 -0700
Subject: [PATCH 050/262] Updated dependencies.

---
 .idea/mobibot.iml                                         | 2 +-
 .idea/modules/mobibot.main.iml                            | 8 ++++----
 .idea/modules/mobibot.test.iml                            | 8 ++++----
 build.gradle                                              | 8 ++------
 .../java/net/thauvin/erik/mobibot/ReleaseInfo.java        | 6 +++---
 version.properties                                        | 6 +++---
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 8c4120d..f17fbd0 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+349" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+359" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 13a7f5b..a1e4f5f 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+349" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+359" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.5.0/cfd127ae6de4862daa93e15ceae9291108eaabc5/okhttp-4.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.5.0/b6b52caca243e75a8fbb95ff6ec9de6b2bdb1481/okio-jvm-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.6.0/1885ec944e0a74e78359756e88ce656fd5a596d5/okhttp-4.6.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -60,7 +60,7 @@
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.6.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20190722" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
@@ -73,7 +73,7 @@
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.6.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index ece1a8b..e4032fa 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+349" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+359" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.5.0/cfd127ae6de4862daa93e15ceae9291108eaabc5/okhttp-4.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.5.0/b6b52caca243e75a8fbb95ff6ec9de6b2bdb1481/okio-jvm-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.6.0/1885ec944e0a74e78359756e88ce656fd5a596d5/okhttp-4.6.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -60,7 +60,7 @@
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.6.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20190722" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
@@ -75,7 +75,7 @@
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.6.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.12.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
diff --git a/build.gradle b/build.gradle
index 0a7ea7a..f38e8d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.28.0'
-    id 'com.github.spotbugs' version '4.0.7'
+    id 'com.github.spotbugs' version '4.0.8'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.8.0'
     id 'jacoco'
@@ -48,7 +48,7 @@ dependencies {
     implementation 'commons-cli:commons-cli:1.4'
 
     implementation 'commons-net:commons-net:3.6'
-    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
 
     implementation 'com.rometools:rome:1.12.2'
 
@@ -115,10 +115,6 @@ detekt {
     baseline = file("detekt-baseline.xml")
 }
 
-tasks.withType(io.gitlab.arturbosch.detekt.Detekt) {
-    exclude("**/**.java")
-}
-
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
     options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 686c1a4..e70a3aa 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1588132687770L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1588283857809L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "alpha";
-    public static final String BUILDMETA = "348";
-    public static final String VERSION = "0.8.0-alpha+348";
+    public static final String BUILDMETA = "357";
+    public static final String VERSION = "0.8.0-alpha+357";
 
     /**
      * Disables the default constructor.
diff --git a/version.properties b/version.properties
index 46bdf8b..4cd9b26 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Apr 28 20:58:04 PDT 2020
-version.buildmeta=348
+#Thu Apr 30 15:03:19 PDT 2020
+version.buildmeta=359
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=alpha
 version.project=mobibot
-version.semver=0.8.0-alpha+348
+version.semver=0.8.0-alpha+359

From eecc2f093f955094c5a3c5be6a06da33ce11df3f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 1 May 2020 22:57:17 -0700
Subject: [PATCH 051/262] Fixed bug in setProperty where the wrong constant was
 used.

---
 .../java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index f4213d4..6db470a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -237,7 +237,7 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         super.setProperty(key, value)
         if (KEYWORDS_PROP == key) {
             keywords.addAll(value.split(TAG_MATCH.toRegex()))
-        } else if (KEYWORDS_PROP == key) {
+        } else if (TAGS_PROP == key) {
             defaultTags.addAll(value.split(TAG_MATCH.toRegex()))
         }
     }

From 2461504888f95b437248dc7a6562b894ee72fe3a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 1 May 2020 22:57:51 -0700
Subject: [PATCH 052/262] Updated Gradle.

---
 .idea/mobibot.iml                                           | 2 +-
 .idea/modules/mobibot.main.iml                              | 2 +-
 .idea/modules/mobibot.test.iml                              | 2 +-
 gradle/wrapper/gradle-wrapper.properties                    | 2 +-
 .../java/net/thauvin/erik/mobibot/ReleaseInfo.java          | 6 +++---
 version.properties                                          | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index f17fbd0..d60f499 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+359" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+360" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index a1e4f5f..752d102 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+359" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+360" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index e4032fa..0003454 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+359" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+360" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index de4250e..f1cd993 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index e70a3aa..a3567a6 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1588283857809L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1588392356654L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "alpha";
-    public static final String BUILDMETA = "357";
-    public static final String VERSION = "0.8.0-alpha+357";
+    public static final String BUILDMETA = "360";
+    public static final String VERSION = "0.8.0-alpha+360";
 
     /**
      * Disables the default constructor.
diff --git a/version.properties b/version.properties
index 4cd9b26..b80a0ac 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Thu Apr 30 15:03:19 PDT 2020
-version.buildmeta=359
+#Fri May 01 21:48:04 PDT 2020
+version.buildmeta=361
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=alpha
 version.project=mobibot
-version.semver=0.8.0-alpha+359
+version.semver=0.8.0-alpha+361

From 6c394c373dde86605ff639efb2e0b89d18a851e5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 10 May 2020 21:25:06 -0700
Subject: [PATCH 053/262] Fixed missing property initialization.

---
 .../java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index b97f260..1211fcb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -50,6 +50,10 @@ class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
         const val FEED_PROP = "feed"
     }
 
+    init {
+        initProperties(FEED_PROP)
+    }
+
     override fun commandResponse(
         sender: String,
         login: String,

From ea21cd53832ce45a9192eaff06ae18b2e72476d1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 19 May 2020 00:00:02 -0700
Subject: [PATCH 054/262] Updated dependencies.

---
 .idea/compiler.xml                                | 15 +++------------
 .idea/jarRepositories.xml                         |  5 +++++
 .idea/mobibot.iml                                 |  2 +-
 .idea/modules/mobibot.main.iml                    |  6 +++---
 .idea/modules/mobibot.test.iml                    |  6 +++---
 build.gradle                                      | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties          |  2 +-
 .../net/thauvin/erik/mobibot/ReleaseInfo.java     |  6 +++---
 version.properties                                |  6 +++---
 9 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index a87304a..121136f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -4,19 +4,10 @@
     <annotationProcessing>
       <profile name="Gradle Imported" enabled="true">
         <outputRelativeToContentRoot value="true" />
-        <option name="semver.project.dir" value="K:\java\mobibot" />
+        <option name="semver.project.dir" value="$PROJECT_DIR$" />
         <processorPath useClasspath="false">
-          <entry name="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/github/spullara/mustache/java/compiler/0.9.6/compiler-0.9.6.jar" />
-        </processorPath>
-        <module name="mobibot.main" />
-      </profile>
-      <profile name="Gradle Imported" enabled="true">
-        <outputRelativeToContentRoot value="true" />
-        <option name="semver.project.dir" value="K:\java\mobibot" />
-        <processorPath useClasspath="false">
-          <entry name="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/github/spullara/mustache/java/compiler/0.9.6/compiler-0.9.6.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/semver/1.2.0/1009ce8f284d9d9e839aae2d7a6e0bf2a2b401bf/semver-1.2.0.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.spullara.mustache.java/compiler/0.9.6/1b8707299c34406ed0ba40bbf8513352ac4765c9/compiler-0.9.6.jar" />
         </processorPath>
         <module name="mobibot.main" />
       </profile>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index d32dd97..bd33cec 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="BintrayJCenter" />
       <option name="url" value="https://jcenter.bintray.com/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$MAVEN_REPOSITORY$" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index d60f499..b8a9c15 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+360" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+361" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 752d102..a5171c7 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+360" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+361" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.6.0/1885ec944e0a74e78359756e88ce656fd5a596d5/okhttp-4.6.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/semver/1.2.0/1009ce8f284d9d9e839aae2d7a6e0bf2a2b401bf/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/pinboard-poster/1.0.1/56296a0293d621e99c479d26760a7aa345d237e7/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.6.0/1885ec944e0a74e78359756e88ce656fd5a596d5/okhttp-4.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.6/6f14738ec2e9dd0011e343717fa624a10f8aab64/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -26,7 +26,7 @@
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.2.1/3839faf625f4197acaeceeb6da000f011a2acb49/kotlinx-coroutines-core-1.2.1.jar" />
-              <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
             </array>
           </option>
           <option name="errors">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 0003454..1e28242 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+360" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+361" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main;K:/java/mobibot/build/classes/kotlin/main;C:/Users/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar;K:/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.6.0/1885ec944e0a74e78359756e88ce656fd5a596d5/okhttp-4.6.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar;K:/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar;K:/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;K:/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar;C:/Users/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/pinboard-poster/1.0.1/56296a0293d621e99c479d26760a7aa345d237e7/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.6.0/1885ec944e0a74e78359756e88ce656fd5a596d5/okhttp-4.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.6/6f14738ec2e9dd0011e343717fa624a10f8aab64/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -31,7 +31,7 @@
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.2.1/3839faf625f4197acaeceeb6da000f011a2acb49/kotlinx-coroutines-core-1.2.1.jar" />
-              <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
             </array>
           </option>
           <option name="errors">
diff --git a/build.gradle b/build.gradle
index f38e8d5..10d51ca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,9 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.28.0'
-    id 'com.github.spotbugs' version '4.0.8'
+    id 'com.github.spotbugs' version '4.2.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.8.0'
+    id 'io.gitlab.arturbosch.detekt' version '1.9.1'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
@@ -22,8 +22,8 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
-    log4j   : '2.13.2',
-    spotbugs: '4.0.2'
+    log4j   : '2.13.3',
+    spotbugs: '4.0.3'
 ]
 
 repositories {
@@ -48,7 +48,7 @@ dependencies {
     implementation 'commons-cli:commons-cli:1.4'
 
     implementation 'commons-net:commons-net:3.6'
-    implementation 'com.squareup.okhttp3:okhttp:4.6.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.7.1'
 
     implementation 'com.rometools:rome:1.12.2'
 
@@ -65,7 +65,7 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
 
     testImplementation 'org.testng:testng:7.2.0'
-    testImplementation 'org.assertj:assertj-core:3.15.0'
+    testImplementation 'org.assertj:assertj-core:3.16.1'
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
     spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f1cd993..a4f0001 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index a3567a6..6d8bae9 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1588392356654L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1589170478622L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "alpha";
-    public static final String BUILDMETA = "360";
-    public static final String VERSION = "0.8.0-alpha+360";
+    public static final String BUILDMETA = "367";
+    public static final String VERSION = "0.8.0-alpha+367";
 
     /**
      * Disables the default constructor.
diff --git a/version.properties b/version.properties
index b80a0ac..46a0dc2 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri May 01 21:48:04 PDT 2020
-version.buildmeta=361
+#Sun May 10 21:14:35 PDT 2020
+version.buildmeta=367
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=alpha
 version.project=mobibot
-version.semver=0.8.0-alpha+361
+version.semver=0.8.0-alpha+367

From d843c65f6f3e4387c56608b0503d640a8f0aac8a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 13 Jun 2020 02:04:04 -0700
Subject: [PATCH 055/262] Updated dependencies.

---
 .idea/compiler.xml                            |  4 ++--
 .idea/jarRepositories.xml                     |  5 +++++
 .idea/mobibot.iml                             |  2 +-
 .idea/modules/mobibot.main.iml                | 18 ++++++++---------
 .idea/modules/mobibot.test.iml                | 20 +++++++++----------
 build.gradle                                  | 14 ++++++-------
 config/pmd.xml                                |  3 +--
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |  6 +++---
 version.properties                            |  8 ++++----
 9 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 121136f..5a0b3ad 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,8 +6,8 @@
         <outputRelativeToContentRoot value="true" />
         <option name="semver.project.dir" value="$PROJECT_DIR$" />
         <processorPath useClasspath="false">
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/semver/1.2.0/1009ce8f284d9d9e839aae2d7a6e0bf2a2b401bf/semver-1.2.0.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.spullara.mustache.java/compiler/0.9.6/1b8707299c34406ed0ba40bbf8513352ac4765c9/compiler-0.9.6.jar" />
+          <entry name="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/github/spullara/mustache/java/compiler/0.9.6/compiler-0.9.6.jar" />
         </processorPath>
         <module name="mobibot.main" />
       </profile>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index bd33cec..29dc1da 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,5 +31,10 @@
       <option name="name" value="MavenLocal" />
       <option name="url" value="file:$MAVEN_REPOSITORY$" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$MAVEN_REPOSITORY$/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index b8a9c15..d08914c 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+361" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+367" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index a5171c7..a48ef5b 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+361" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+367" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/semver/1.2.0/1009ce8f284d9d9e839aae2d7a6e0bf2a2b401bf/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/pinboard-poster/1.0.1/56296a0293d621e99c479d26760a7aa345d237e7/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.6.0/1885ec944e0a74e78359756e88ce656fd5a596d5/okhttp-4.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.6/6f14738ec2e9dd0011e343717fa624a10f8aab64/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.3/755cc5d84d32b31beeaf8597181f0fc4eac98e16/spotbugs-annotations-4.0.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -26,7 +26,7 @@
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.2.1/3839faf625f4197acaeceeb6da000f011a2acb49/kotlinx-coroutines-core-1.2.1.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
+              <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
             </array>
           </option>
           <option name="errors">
@@ -51,18 +51,18 @@
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.7.2" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20190722" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 1e28242..698e09a 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+361" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+367" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.2/8eb1fc1914eb2550bf3ddea26917c9a7cbb00593/log4j-core-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.2/49df25f7a35dd7fbd8131fc5ab09665d18e3d4fe/log4j-slf4j-impl-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.2/567ea514dedd8679c429c5b5b39b0d67b6464c3c/log4j-api-2.13.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.thauvin.erik/pinboard-poster/1.0.1/56296a0293d621e99c479d26760a7aa345d237e7/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.6.0/1885ec944e0a74e78359756e88ce656fd5a596d5/okhttp-4.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20190722/7bce7bacf0ab5e9f894d307a3de8b7f540064d5/json-20190722.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.2/e203eecc94365a6885f262d0e4c99ec059980d2e/spotbugs-annotations-4.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.15.0/b5b633545f357f576bd0661b302914a3951319d/assertj-core-3.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.6/6f14738ec2e9dd0011e343717fa624a10f8aab64/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.3/755cc5d84d32b31beeaf8597181f0fc4eac98e16/spotbugs-annotations-4.0.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -31,7 +31,7 @@
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.2.1/3839faf625f4197acaeceeb6da000f011a2acb49/kotlinx-coroutines-core-1.2.1.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar" />
+              <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
             </array>
           </option>
           <option name="errors">
@@ -52,24 +52,24 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="mobibot.main" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.7.2" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20190722" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.3" level="project" />
     <orderEntry type="library" name="Gradle: org.testng:testng:7.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.16.1" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
diff --git a/build.gradle b/build.gradle
index 10d51ca..05cf95e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,14 +2,14 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.28.0'
-    id 'com.github.spotbugs' version '4.2.0'
+    id 'com.github.spotbugs' version '4.3.0'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.9.1'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
     id 'org.jetbrains.kotlin.jvm' version '1.3.72'
-    id 'org.sonarqube' version '2.8'
+    id 'org.sonarqube' version '3.0'
     id 'pmd'
 }
 
@@ -23,7 +23,7 @@ mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
     log4j   : '2.13.3',
-    spotbugs: '4.0.3'
+    spotbugs: '4.0.4'
 ]
 
 repositories {
@@ -48,11 +48,11 @@ dependencies {
     implementation 'commons-cli:commons-cli:1.4'
 
     implementation 'commons-net:commons-net:3.6'
-    implementation 'com.squareup.okhttp3:okhttp:4.7.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.7.2'
 
-    implementation 'com.rometools:rome:1.12.2'
+    implementation 'com.rometools:rome:1.13.1'
 
-    implementation 'org.json:json:20190722'
+    implementation 'org.json:json:20200518'
     implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'net.objecthunter:exp4j:0.4.8'
 
@@ -104,7 +104,7 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
 }
 
 pmd {
-    toolVersion = '6.23.0'
+    toolVersion = '6.24.0'
     ignoreFailures = true
     ruleSets = []
     ruleSetFiles = files("${projectDir}/config/pmd.xml")
diff --git a/config/pmd.xml b/config/pmd.xml
index 65fe3ec..1233156 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -20,8 +20,7 @@
                       value="./MethodDeclarator[@Image='hashCode' or @Image='equals' or @Image='toString']"/>
         </properties>
     </rule>
-    <rule ref="category/java/bestpractices.xml/PositionLiteralsFirstInCaseInsensitiveComparisons"/>
-    <rule ref="category/java/bestpractices.xml/PositionLiteralsFirstInComparisons"/>
+    <rule ref="category/java/bestpractices.xml/LiteralsFirstInComparisons"/>
     <rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
     <rule ref="category/java/bestpractices.xml/ReplaceEnumerationWithIterator"/>
     <!-- <rule ref="category/java/bestpractices.xml/ReplaceHashtableWithMap"/>
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 6d8bae9..f7959aa 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1589170478622L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592038362460L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "alpha";
-    public static final String BUILDMETA = "367";
-    public static final String VERSION = "0.8.0-alpha+367";
+    public static final String BUILDMETA = "370";
+    public static final String VERSION = "0.8.0-alpha+370";
 
     /**
      * Disables the default constructor.
diff --git a/version.properties b/version.properties
index 46a0dc2..e16403d 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sun May 10 21:14:35 PDT 2020
-version.buildmeta=367
+#Sat Jun 13 02:01:11 PDT 2020
+version.buildmeta=001
 version.major=0
 version.minor=8
 version.patch=0
-version.prerelease=alpha
+version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-alpha+367
+version.semver=0.8.0-beta+001

From d6a85ef4af145ea1aecd48ff6967707e4501be86 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 13 Jun 2020 03:27:50 -0700
Subject: [PATCH 056/262] Cleaned up msg.

---
 .idea/mobibot.iml                             |  2 +-
 .idea/modules/mobibot.main.iml                | 10 ++--
 .idea/modules/mobibot.test.iml                | 10 ++--
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |  8 ++--
 .../net/thauvin/erik/mobibot/Mobibot.java     |  2 +-
 .../thauvin/erik/mobibot/modules/Joke.java    |  2 +-
 .../thauvin/erik/mobibot/modules/Twitter.java |  2 +-
 .../erik/mobibot/modules/WorldTime.java       |  6 +--
 .../thauvin/erik/mobibot/msg/ErrorMessage.kt  | 28 ++---------
 .../net/thauvin/erik/mobibot/msg/Message.kt   | 48 ++++++-------------
 .../thauvin/erik/mobibot/msg/NoticeMessage.kt | 24 ++--------
 .../erik/mobibot/msg/PrivateMessage.kt        | 22 ++-------
 .../thauvin/erik/mobibot/msg/PublicMessage.kt | 22 ++-------
 .../modules/CurrencyConverterTest.java        |  6 +--
 .../mobibot/modules/GoogleSearchTest.java     |  4 +-
 .../erik/mobibot/modules/JokeTest.java        |  4 +-
 .../erik/mobibot/modules/StockQuoteTest.java  |  2 +-
 .../erik/mobibot/modules/TwitterTest.java     |  2 +-
 .../erik/mobibot/modules/Weather2Test.java    |  8 ++--
 .../erik/mobibot/modules/WordTimeTest.java    |  4 +-
 version.properties                            |  6 +--
 21 files changed, 68 insertions(+), 154 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index d08914c..65c3f72 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-alpha+367" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+001" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index a48ef5b..e420b4e 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+367" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+001" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.3/755cc5d84d32b31beeaf8597181f0fc4eac98e16/spotbugs-annotations-4.0.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.4/e97331cf473041be64301e6e7ebdc70700fdff24/spotbugs-annotations-4.0.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.13.1/3e949b65fa4224e78e3c513a54be56430b18ea6/rome-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.13.1/a59ce341139f0c58901127fab6445bd1c496af9/rome-utils-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -51,7 +51,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.4" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
@@ -61,7 +61,7 @@
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.7.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
@@ -74,7 +74,7 @@
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.12.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 698e09a..6376829 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-alpha+367" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+001" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.12.2/eaa7a2025cd38a6678d96b2b78b4f7e68e3f8e36/rome-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.3/755cc5d84d32b31beeaf8597181f0fc4eac98e16/spotbugs-annotations-4.0.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.12.2/240dc40fb9333ac872319e7d31178bffc63f7900/rome-utils-1.12.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.13.1/3e949b65fa4224e78e3c513a54be56430b18ea6/rome-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.4/e97331cf473041be64301e6e7ebdc70700fdff24/spotbugs-annotations-4.0.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.13.1/a59ce341139f0c58901127fab6445bd1c496af9/rome-utils-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -61,13 +61,13 @@
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.7.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.4" level="project" />
     <orderEntry type="library" name="Gradle: org.testng:testng:7.2.0" level="project" />
     <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.16.1" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
@@ -76,7 +76,7 @@
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.12.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index f7959aa..06bb921 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592038362460L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592043035449L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
-    public static final String PRERELEASE = "alpha";
-    public static final String BUILDMETA = "370";
-    public static final String VERSION = "0.8.0-alpha+370";
+    public static final String PRERELEASE = "beta";
+    public static final String BUILDMETA = "004";
+    public static final String VERSION = "0.8.0-beta+004";
 
     /**
      * Disables the default constructor.
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 16d09b9..945ad1f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -850,7 +850,7 @@ public class Mobibot extends PircBot {
      * @param message The message.
      */
     public final void send(final String who, final Message message) {
-        send(message.isNotice() ? who : getChannel(), message.getText(), message.getColor(), message.isPrivate());
+        send(message.isNotice() ? who : getChannel(), message.getMsg(), message.getColor(), message.isPrivate());
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
index 5c1d858..23ed888 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
@@ -101,7 +101,7 @@ public final class Joke extends ThreadedModule {
     @Override
     void run(final String sender, final String cmd, final String arg, final boolean isPrivate) {
         try {
-            bot.send(Utils.cyan(randomJoke().getText()));
+            bot.send(Utils.cyan(randomJoke().getMsg()));
         } catch (ModuleException e) {
             bot.getLogger().warn(e.getDebugMessage(), e);
             bot.send(sender, e.getMessage(), isPrivate);
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index 7264694..7728a9f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -258,7 +258,7 @@ public final class Twitter extends ThreadedModule {
     void run(final String sender, final String cmd, final String message, final boolean isPrivate) {
         try {
             bot.send(sender,
-                     post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getText(),
+                     post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getMsg(),
                      isPrivate);
         } catch (ModuleException e) {
             bot.getLogger().warn(e.getDebugMessage(), e);
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
index 48092d8..05bcc22 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
@@ -226,12 +226,12 @@ public final class WorldTime extends AbstractModule {
         } else {
             final Message msg = worldTime(args);
             if (isPrivate) {
-                bot.send(sender, msg.getText(), true);
+                bot.send(sender, msg.getMsg(), true);
             } else {
                 if (msg.isError()) {
-                    bot.send(sender, msg.getText(), false);
+                    bot.send(sender, msg.getMsg(), false);
                 } else {
-                    bot.send(msg.getText());
+                    bot.send(msg.getMsg());
                 }
             }
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt b/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
index 6c00add..b353fe8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
@@ -38,29 +38,11 @@ package net.thauvin.erik.mobibot.msg
  * @created 2019-04-07
  * @since 1.0
  */
-class ErrorMessage : Message {
-    /**
-     * Creates a new error message.
-     *
-     * @param text The error message.
-     */
-    constructor(text: String) : super() {
-        this.text = text
-        isError = true
-        isNotice = true
-    }
-
-    /**
-     * Creates a new error message.
-     *
-     * @param text The message.
-     * @param color The message color.
-     */
-    @Suppress("unused")
-    constructor(text: String, color: String) : super() {
-        this.text = text
-        isError = true
-        isNotice = true
+class ErrorMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
+    init {
+        this.msg = msg
         this.color = color
+        isError = true
+        isNotice = true
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
index d95e792..d3fe758 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
@@ -41,8 +41,12 @@ import org.jibble.pircbot.Colors
  * @since 1.0
  */
 open class Message {
+    companion object {
+        var DEFAULT_COLOR = Colors.NORMAL
+    }
+
     /** Color */
-    var color = Colors.NORMAL
+    var color = DEFAULT_COLOR
 
     /** Error */
     var isError = false
@@ -54,7 +58,7 @@ open class Message {
     var isPrivate = false
 
     /** Message text*/
-    var text = ""
+    var msg = ""
 
     /** Creates a new message. */
     constructor() {
@@ -64,42 +68,18 @@ open class Message {
     /**
      * Creates a new message.
      *
-     * @param text The message.
-     * @param isNotice The notice flag.
-     * @param isError The error flag.
-     * @param isPrivate The Private message
-     */
-    constructor(text: String, isNotice: Boolean, isError: Boolean, isPrivate: Boolean) {
-        this.text = text
-        this.isNotice = isNotice
-        this.isError = isError
-        this.isPrivate = isPrivate
-    }
-
-    /**
-     * Creates a new message.
-     *
-     * @param text The message.
-     * @param isNotice The notice flag.
-     * @param isError The error flag.
-     * @param isPrivate The Private message
+     * @param msg The message.
      * @param color The color.
+     * @param isNotice The notice flag.
+     * @param isError The error flag.
+     * @param isPrivate The private flag.
      */
-    constructor(
-        text: String,
-        isNotice: Boolean,
-        isError: Boolean,
-        isPrivate: Boolean,
-        color: String
-    ) {
-        this.text = text
+    @JvmOverloads
+    constructor(msg: String, color: String = DEFAULT_COLOR, isNotice: Boolean, isError: Boolean, isPrivate: Boolean) {
+        this.msg = msg
+        this.color = color
         this.isNotice = isNotice
         this.isError = isError
         this.isPrivate = isPrivate
-        this.color = color
-    }
-
-    override fun toString(): String {
-        return "Message(color='$color', isError=$isError, isNotice=$isNotice, isPrivate=$isPrivate, message='$text')"
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt b/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
index b7c0ad3..3286d60 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
@@ -38,26 +38,10 @@ package net.thauvin.erik.mobibot.msg
  * @created 2019-04-07
  * @since 1.0
  */
-class NoticeMessage : Message {
-    /**
-     * Creates a new notice.
-     *
-     * @param text The notice's message.
-     */
-    constructor(text: String) : super() {
-        this.text = text
-        isNotice = true
-    }
-
-    /**
-     * Create a new notice.
-     *
-     * @param text The notice's message.
-     * @param color The color.
-     */
-    constructor(text: String, color: String) : super() {
-        this.text = text
-        isNotice = true
+class NoticeMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
+    init {
+        this.msg = msg
         this.color = color
+        isNotice = true
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt b/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
index 4f9d4e9..8eb4281 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
@@ -39,25 +39,9 @@ package net.thauvin.erik.mobibot.msg
  * @since 1.0
  */
 @Suppress("unused")
-class PrivateMessage : Message {
-    /**
-     * Creates a new private message.
-     *
-     * @param text The message.
-     */
-    constructor(text: String) : super() {
-        this.text = text
-        isPrivate = true
-    }
-
-    /**
-     * Creates a new private message.
-     *
-     * @param text The message.
-     * @param color The message color.
-     */
-    constructor(text: String, color: String) : super() {
-        this.text = text
+class PrivateMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
+    init {
+        this.msg = msg
         this.color = color
         isPrivate = true
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt b/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
index 2bd991b..3d2ac0f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
@@ -38,25 +38,9 @@ package net.thauvin.erik.mobibot.msg
  * @created 2019-04-07
  * @since 1.0
  */
-class PublicMessage : Message {
-    /**
-     * Creates a new public message.
-     *
-     * @param text The message.
-     */
-    constructor(text: String) : super() {
-        this.text = text
-    }
-
-    /**
-     * Creates a new public message.
-     *
-     * @param text The message.
-     * @param color The message color.
-     */
-    @Suppress("unused")
-    constructor(text: String, color: String) : super() {
-        this.text = text
+class PublicMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
+    init {
+        this.msg = msg
         this.color = color
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
index f1b410a..b67fd6f 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
@@ -54,11 +54,11 @@ public class CurrencyConverterTest {
     @Test
     @SuppressFBWarnings("PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS")
     public void testConvertCurrency() {
-        assertThat(CurrencyConverter.convertCurrency("100 USD to EUR").getText())
+        assertThat(CurrencyConverter.convertCurrency("100 USD to EUR").getMsg())
                 .as("100 USD to EUR").matches("100\\.00 USD = \\d{2,3}\\.\\d{2} EUR");
-        assertThat(CurrencyConverter.convertCurrency("100 USD to USD").getText())
+        assertThat(CurrencyConverter.convertCurrency("100 USD to USD").getMsg())
                 .as("100 USD to USD").contains("You're kidding, right?");
-        assertThat(CurrencyConverter.convertCurrency("100 USD").getText())
+        assertThat(CurrencyConverter.convertCurrency("100 USD").getMsg())
                 .as("100 USD").contains("Invalid query.");
         assertThat(CurrencyConverter.currencyRates().size())
                 .as("currencyRates().size() == 33").isEqualTo(33);
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
index 0d8a5f9..7633f84 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
@@ -63,11 +63,11 @@ public class GoogleSearchTest extends LocalProperties {
         try {
             List<Message> messages = GoogleSearch.searchGoogle("mobibot site:github.com", apiKey, cseKey);
             assertThat(messages).as("mobibot results not empty").isNotEmpty();
-            assertThat(messages.get(0).getText()).as("found mobitopia").contains("mobibot");
+            assertThat(messages.get(0).getMsg()).as("found mobitopia").contains("mobibot");
 
             messages = GoogleSearch.searchGoogle("aapl", apiKey, cseKey);
             assertThat(messages).as("aapl results not empty").isNotEmpty();
-            assertThat(messages.get(0).getText()).as("found apple").containsIgnoringCase("apple");
+            assertThat(messages.get(0).getMsg()).as("found apple").containsIgnoringCase("apple");
 
             assertThatThrownBy(() -> GoogleSearch.searchGoogle("test", "", "apiKey")).as("no API key").isInstanceOf(
                     ModuleException.class).hasNoCause();
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
index df6ddc7..9880241 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
@@ -51,7 +51,7 @@ public class JokeTest {
 
     @Test
     public void testRamdomJoke() throws ModuleException {
-        assertThat(Joke.randomJoke().getText().length() > 0).as("randomJoke() > 0").isTrue();
-        assertThat(Joke.randomJoke().getText()).as("randomJoke()").containsIgnoringCase("chuck");
+        assertThat(Joke.randomJoke().getMsg().length() > 0).as("randomJoke() > 0").isTrue();
+        assertThat(Joke.randomJoke().getMsg()).as("randomJoke()").containsIgnoringCase("chuck");
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
index 2eec2a0..715fe64 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
@@ -58,7 +58,7 @@ public class StockQuoteTest extends LocalProperties {
         try {
             final List<Message> messages = StockQuote.getQuote("apple inc", apiKey);
             assertThat(messages).as("response not empty").isNotEmpty();
-            assertThat(messages.get(0).getText()).as("same stock symbol").contains("AAPL").contains("Apple Inc.");
+            assertThat(messages.get(0).getMsg()).as("same stock symbol").contains("AAPL").contains("Apple Inc.");
 
             try {
                 StockQuote.getQuote("blahfoo", apiKey);
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
index 04cf36c..11d4123 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
@@ -73,6 +73,6 @@ public class TwitterTest extends LocalProperties {
                 getProperty(Twitter.TOKEN_SECRET_PROP),
                 getProperty(Twitter.HANDLE_PROP),
                 msg,
-                true).getText()).as("twitterPost(" + msg + ')').isEqualTo(msg);
+                true).getMsg()).as("twitterPost(" + msg + ')').isEqualTo(msg);
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
index 0c1309e..ffd5c60 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
@@ -54,12 +54,12 @@ public class Weather2Test extends LocalProperties {
     @Test
     public void testWeather() throws ModuleException {
         List<Message> messages = Weather2.getWeather("98204", getProperty(Weather2.OWM_API_KEY_PROP));
-        assertThat(messages.get(0).getText()).as("is Everett").contains("Everett").contains("US");
-        assertThat(messages.get(messages.size() - 1).getText()).as("is City Search").endsWith("98204%2CUS");
+        assertThat(messages.get(0).getMsg()).as("is Everett").contains("Everett").contains("US");
+        assertThat(messages.get(messages.size() - 1).getMsg()).as("is City Search").endsWith("98204%2CUS");
 
         messages = Weather2.getWeather("London, UK", getProperty(Weather2.OWM_API_KEY_PROP));
-        assertThat(messages.get(0).getText()).as("is UK").contains("London").contains("UK");
-        assertThat(messages.get(messages.size() - 1).getText()).as("is City Code").endsWith("4517009");
+        assertThat(messages.get(0).getMsg()).as("is UK").contains("London").contains("UK");
+        assertThat(messages.get(messages.size() - 1).getMsg()).as("is City Code").endsWith("4517009");
 
         assertThatThrownBy(() -> Weather2.getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP)))
                 .as("Montpellier not found").hasCauseInstanceOf(APIException.class);
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
index 9c7299a..5f862ca 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
@@ -47,9 +47,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class WordTimeTest {
     @Test
     public void testWorldTime() {
-        assertThat(WorldTime.worldTime("PST").getText()).as("PST").endsWith(Utils.bold("Los Angeles"));
+        assertThat(WorldTime.worldTime("PST").getMsg()).as("PST").endsWith(Utils.bold("Los Angeles"));
         assertThat(WorldTime.worldTime("BLAH").isError()).as("BLAH").isTrue();
-        assertThat(WorldTime.worldTime("BEATS").getText()).as("BEATS").contains("@");
+        assertThat(WorldTime.worldTime("BEATS").getMsg()).as("BEATS").contains("@");
     }
 
     @Test
diff --git a/version.properties b/version.properties
index e16403d..3a1fdac 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Jun 13 02:01:11 PDT 2020
-version.buildmeta=001
+#Sat Jun 13 03:10:34 PDT 2020
+version.buildmeta=004
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+001
+version.semver=0.8.0-beta+004

From b729eb272900a85c9ba813b13920ecdad4c5ad53 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 19 Jun 2020 14:19:23 -0700
Subject: [PATCH 057/262] Moved Pinboard to kotlin and added tests.

---
 detekt-baseline.xml                           |  12 +-
 .../net/thauvin/erik/mobibot/Mobibot.java     |  18 +-
 .../net/thauvin/erik/mobibot/Pinboard.java    | 167 ------------------
 .../net/thauvin/erik/mobibot/PinboardUtils.kt | 141 +++++++++++++++
 .../{modules => }/LocalProperties.java        |   8 +-
 .../thauvin/erik/mobibot/PinboardUtilsTest.kt |  86 +++++++++
 .../mobibot/modules/GoogleSearchTest.java     |   1 +
 .../erik/mobibot/modules/StockQuoteTest.java  |   1 +
 .../erik/mobibot/modules/TwitterTest.java     |   1 +
 .../erik/mobibot/modules/Weather2Test.java    |   1 +
 10 files changed, 254 insertions(+), 182 deletions(-)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/Pinboard.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
 rename src/test/java/net/thauvin/erik/mobibot/{modules => }/LocalProperties.java (93%)
 create mode 100644 src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt

diff --git a/detekt-baseline.xml b/detekt-baseline.xml
index d61a8d8..93d9e37 100644
--- a/detekt-baseline.xml
+++ b/detekt-baseline.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <SmellBaseline>
-  <Blacklist></Blacklist>
-  <Whitelist>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
+  <CurrentIssues>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
@@ -12,8 +12,8 @@
     <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
     <ID>MagicNumber:Users.kt$Users$8</ID>
     <ID>MagicNumber:View.kt$View$8</ID>
-    <ID>NestedBlockDepth:Addons.kt$Addons$add</ID>
-    <ID>NestedBlockDepth:Comment.kt$Comment$commandResponse</ID>
-    <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$commandResponse</ID>
-  </Whitelist>
+    <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:LinksMgr.kt$LinksMgr$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
+  </CurrentIssues>
 </SmellBaseline>
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 945ad1f..df34caa 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -70,6 +70,7 @@ import net.thauvin.erik.mobibot.modules.War;
 import net.thauvin.erik.mobibot.modules.Weather2;
 import net.thauvin.erik.mobibot.modules.WorldTime;
 import net.thauvin.erik.mobibot.msg.Message;
+import net.thauvin.erik.pinboard.PinboardPoster;
 import net.thauvin.erik.semver.Version;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -96,6 +97,7 @@ import java.nio.file.Paths;
 import java.util.List;
 import java.util.Properties;
 import java.util.Timer;
+import java.util.logging.ConsoleHandler;
 import java.util.regex.Pattern;
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
@@ -154,7 +156,7 @@ public class Mobibot extends PircBot {
     // NickServ ident password
     private String identPwd = "";
     // Pinboard posts handler
-    private Pinboard pinboard;
+    private PinboardPoster pinboard;
     // Weblog URL
     private String weblogUrl = "";
 
@@ -383,7 +385,7 @@ public class Mobibot extends PircBot {
      */
     public final void addPin(final EntryLink entry) {
         if (pinboard != null) {
-            pinboard.addPost(entry);
+            PinboardUtils.addPin(pinboard, ircServer, entry);
         }
     }
 
@@ -423,7 +425,7 @@ public class Mobibot extends PircBot {
      */
     public final void deletePin(final int index, final EntryLink entry) {
         if (pinboard != null) {
-            pinboard.deletePost(entry);
+            PinboardUtils.deletePin(pinboard, entry);
         }
         if (twitter.isAutoPost()) {
             twitter.removeEntry(index);
@@ -914,7 +916,13 @@ public class Mobibot extends PircBot {
      */
     final void setPinboardAuth(final String apiToken) {
         if (isNotBlank(apiToken)) {
-            pinboard = new Pinboard(this, apiToken);
+            pinboard = new PinboardPoster(apiToken);
+            if (LOGGER.isDebugEnabled()) {
+                final ConsoleHandler consoleHandler = new ConsoleHandler();
+                consoleHandler.setLevel(java.util.logging.Level.FINE);
+                pinboard.getLogger().addHandler(consoleHandler);
+                pinboard.getLogger().setLevel(java.util.logging.Level.FINE);
+            }
         }
     }
 
@@ -948,7 +956,7 @@ public class Mobibot extends PircBot {
      */
     public final void updatePin(final String oldUrl, final EntryLink entry) {
         if (pinboard != null) {
-            pinboard.updatePost(oldUrl, entry);
+            PinboardUtils.updatePin(pinboard, ircServer, oldUrl, entry);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java b/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
deleted file mode 100644
index 0291ff3..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/Pinboard.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Pinboard.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot;
-
-import net.thauvin.erik.mobibot.entries.EntryLink;
-import net.thauvin.erik.pinboard.PinboardPoster;
-
-import javax.swing.SwingWorker;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * The class to handle posts to pinboard.in.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2017-05-17
- * @since 1.0
- */
-class Pinboard {
-    private final String ircServer;
-    private final PinboardPoster pinboard;
-
-    /**
-     * Creates a new {@link Pinboard} instance.
-     *
-     * @param bot      The bot's instance.
-     * @param apiToken The API end point.
-     */
-    Pinboard(final Mobibot bot, final String apiToken) {
-        pinboard = new PinboardPoster(apiToken);
-        ircServer = bot.getIrcServer();
-
-        if (bot.getLogger().isDebugEnabled()) {
-            final ConsoleHandler consoleHandler = new ConsoleHandler();
-            consoleHandler.setLevel(Level.FINE);
-            final Logger logger = pinboard.getLogger();
-            logger.addHandler(consoleHandler);
-            logger.setLevel(Level.FINE);
-        }
-    }
-
-    /**
-     * Adds a post to pinboard.in.
-     *
-     * @param entry The entry to add.
-     */
-    final void addPost(final EntryLink entry) {
-        final SwingWorker<Boolean, Void> worker = new SwingWorker<>() {
-            @Override
-            protected Boolean doInBackground() {
-                return pinboard.addPin(entry.getLink(),
-                                       entry.getTitle(),
-                                       postedBy(entry),
-                                       entry.getPinboardTags(),
-                                       formatDate(entry.getDate()));
-            }
-        };
-
-        worker.execute();
-    }
-
-    /**
-     * Deletes a post to pinboard.in.
-     *
-     * @param entry The entry to delete.
-     */
-    final void deletePost(final EntryLink entry) {
-        final String link = entry.getLink();
-
-        final SwingWorker<Boolean, Void> worker = new SwingWorker<>() {
-            @Override
-            protected Boolean doInBackground() {
-                return pinboard.deletePin(link);
-            }
-        };
-
-        worker.execute();
-    }
-
-    /**
-     * Format a date to a UTC timestamp.
-     *
-     * @param date The date.
-     * @return The date in {@link DateTimeFormatter#ISO_INSTANT} format.
-     */
-    private String formatDate(final Date date) {
-        return ZonedDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()).format(DateTimeFormatter.ISO_INSTANT);
-    }
-
-    /**
-     * Returns he pinboard.in extended attribution line.
-     *
-     * @param entry The entry.
-     * @return The extended attribution line.
-     */
-    private String postedBy(final EntryLink entry) {
-        return "Posted by " + entry.getNick() + " on " + entry.getChannel() + " (" + ircServer + ')';
-    }
-
-    /**
-     * Updates a post to pinboard.in.
-     *
-     * @param oldUrl The old post URL.
-     * @param entry  The entry to add.
-     */
-    final void updatePost(final String oldUrl, final EntryLink entry) {
-        final SwingWorker<Boolean, Void> worker = new SwingWorker<>() {
-            @Override
-            protected Boolean doInBackground() {
-                if (!oldUrl.equals(entry.getLink())) {
-                    pinboard.deletePin(oldUrl);
-
-                    return pinboard.addPin(entry.getLink(),
-                                           entry.getTitle(),
-                                           postedBy(entry),
-                                           entry.getPinboardTags(),
-                                           formatDate(entry.getDate()));
-                } else {
-                    return pinboard.addPin(entry.getLink(),
-                                           entry.getTitle(),
-                                           postedBy(entry),
-                                           entry.getPinboardTags(),
-                                           formatDate(entry.getDate()),
-                                           true,
-                                           true);
-                }
-            }
-        };
-
-        worker.execute();
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
new file mode 100644
index 0000000..b12a85f
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -0,0 +1,141 @@
+/*
+ * Pinboard.java
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot
+
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
+import net.thauvin.erik.mobibot.entries.EntryLink
+import net.thauvin.erik.pinboard.PinboardPoster
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.util.*
+
+/**
+ * The class to handle posts to pinboard.in.
+ *
+ * @author [Erik C. Thauvin](https://erik.thauvin.net)
+ * @created 2017-05-17
+ * @since 1.0
+ */
+object PinboardUtils {
+    /**
+     * Adds a pin.
+     *
+     * @param poster The PinboardPoster instance.
+     * @param entry The entry to add.
+     */
+    @JvmStatic
+    fun addPin(poster: PinboardPoster, ircServer: String, entry: EntryLink) = runBlocking {
+        val add = GlobalScope.async {
+            poster.addPin(
+                entry.link,
+                entry.title,
+                postedBy(entry, ircServer),
+                entry.pinboardTags,
+                formatDate(entry.date)
+            )
+        }
+        add.await()
+    }
+
+    /**
+     * Deletes a pin.
+     *
+     * @param poster The PinboardPoster instance.
+     * @param entry The entry to delete.
+     */
+    @JvmStatic
+    fun deletePin(poster: PinboardPoster, entry: EntryLink) = runBlocking {
+        val delete = GlobalScope.async {
+            poster.deletePin(entry.link)
+        }
+        delete.await()
+    }
+
+    /**
+     * Updates a pin.
+     *
+     * @param poster The PinboardPoster instance.
+     * @param oldUrl The old post URL.
+     * @param entry  The entry to add.
+     */
+    @JvmStatic
+    fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) = runBlocking {
+        val update = GlobalScope.async {
+            if (oldUrl != entry.link) {
+                poster.deletePin(oldUrl)
+                poster.addPin(
+                    entry.link,
+                    entry.title,
+                    postedBy(entry, ircServer),
+                    entry.pinboardTags,
+                    formatDate(entry.date)
+                )
+            } else {
+                poster.addPin(
+                    entry.link,
+                    entry.title,
+                    postedBy(entry, ircServer),
+                    entry.pinboardTags,
+                    formatDate(entry.date),
+                    replace = true,
+                    shared = true
+                )
+            }
+        }
+        update.await()
+    }
+
+    /**
+     * Format a date to a UTC timestamp.
+     *
+     * @param date The date.
+     * @return The date in [DateTimeFormatter.ISO_INSTANT] format.
+     */
+    private fun formatDate(date: Date): String {
+        return ZonedDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()).format(DateTimeFormatter.ISO_INSTANT)
+    }
+
+    /**
+     * Returns he pinboard.in extended attribution line.
+     *
+     * @param entry The entry.
+     * @return The extended attribution line.
+     */
+    private fun postedBy(entry: EntryLink, ircServer: String): String {
+        return "Posted by ${entry.nick} on ${entry.channel} ( $ircServer )"
+    }
+}
+
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java b/src/test/java/net/thauvin/erik/mobibot/LocalProperties.java
similarity index 93%
rename from src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java
rename to src/test/java/net/thauvin/erik/mobibot/LocalProperties.java
index acd9dab..1585681 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/LocalProperties.java
+++ b/src/test/java/net/thauvin/erik/mobibot/LocalProperties.java
@@ -1,7 +1,7 @@
 /*
  * LocalProperties.java
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.modules;
+package net.thauvin.erik.mobibot;
 
 import org.apache.commons.lang3.StringUtils;
 import org.testng.annotations.BeforeSuite;
@@ -49,10 +49,10 @@ import java.util.Properties;
  * @created 2019-04-08
  * @since 1.0
  */
-class LocalProperties {
+public class LocalProperties {
     private static final Properties localProps = new Properties();
 
-    static String getProperty(final String key) {
+    public static String getProperty(final String key) {
         if (localProps.containsKey(key)) {
             return localProps.getProperty(key);
         } else {
diff --git a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
new file mode 100644
index 0000000..a8eed6c
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -0,0 +1,86 @@
+/*
+ * PinboardTest.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot
+
+import net.thauvin.erik.mobibot.entries.EntryLink
+import net.thauvin.erik.pinboard.PinboardPoster
+import org.testng.Assert
+import org.testng.annotations.Test
+import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+import java.net.URLEncoder
+import java.net.http.HttpClient
+import java.net.http.HttpRequest
+import java.net.http.HttpResponse
+import java.nio.charset.StandardCharsets
+
+class PinboardUtilsTest : LocalProperties() {
+    @Test
+    @Throws(InterruptedException::class, IOException::class, URISyntaxException::class)
+    fun pinboardTest() {
+        val apiToken = getProperty("pinboard-api-token")
+        val pinboard = PinboardPoster(apiToken)
+        val url = "https://www.example.com/"
+        val ircServer = "irc.test.com"
+        val entry = EntryLink(url, "Test Example", "ErikT", "", "#mobitopia", listOf("test"))
+
+        PinboardUtils.addPin(pinboard, ircServer, entry)
+        Assert.assertTrue(validatePin(apiToken, ircServer, entry.link), "add")
+        entry.link = "https://www.foo.com/"
+
+        PinboardUtils.updatePin(pinboard, ircServer, url, entry)
+        Assert.assertTrue(validatePin(apiToken, ircServer, entry.link), "update")
+
+        PinboardUtils.deletePin(pinboard, entry)
+        Assert.assertFalse(validatePin(apiToken, url = entry.link), "delete")
+    }
+
+    @Throws(IOException::class, URISyntaxException::class, InterruptedException::class)
+    private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean {
+        val request = HttpRequest.newBuilder().uri(
+            URI(
+                "https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
+                    + URLEncoder.encode(url, StandardCharsets.UTF_8)
+            )
+        ).GET().build()
+
+        val response = HttpClient.newBuilder()
+            .build()
+            .send(request, HttpResponse.BodyHandlers.ofString())
+
+        return if (response.statusCode() == 200) {
+            response.body().contains(url) && response.body().contains(ircServer)
+        } else false
+    }
+}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
index 7633f84..ecf0f0f 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
@@ -33,6 +33,7 @@
 package net.thauvin.erik.mobibot.modules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.thauvin.erik.mobibot.LocalProperties;
 import net.thauvin.erik.mobibot.msg.Message;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
index 715fe64..a8961c6 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
@@ -33,6 +33,7 @@
 package net.thauvin.erik.mobibot.modules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.thauvin.erik.mobibot.LocalProperties;
 import net.thauvin.erik.mobibot.msg.Message;
 import org.testng.annotations.Test;
 
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
index 11d4123..88782ad 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
@@ -33,6 +33,7 @@
 package net.thauvin.erik.mobibot.modules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.thauvin.erik.mobibot.LocalProperties;
 import org.testng.annotations.Test;
 
 import java.net.InetAddress;
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
index ffd5c60..6d8c15c 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
@@ -34,6 +34,7 @@ package net.thauvin.erik.mobibot.modules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.aksingh.owmjapis.api.APIException;
+import net.thauvin.erik.mobibot.LocalProperties;
 import net.thauvin.erik.mobibot.msg.Message;
 import org.testng.annotations.Test;
 

From dcd6996c391dc49b40f5b93d4951999a3772f8f5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 19 Jun 2020 14:20:33 -0700
Subject: [PATCH 058/262] Updated dependencies, wrapper, etc.

---
 .idea/compiler.xml                       |  2 +-
 .idea/misc.xml                           |  2 +-
 .idea/mobibot.iml                        |  2 +-
 .idea/modules/mobibot.main.iml           |  9 +++++----
 .idea/modules/mobibot.test.iml           | 10 ++++++++--
 build.gradle                             | 13 ++++++++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 7 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5a0b3ad..1f720ec 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,6 +12,6 @@
         <module name="mobibot.main" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel target="1.9" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c88ae8f..1fa7978 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,5 +6,5 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="14" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="14" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 65c3f72..fbe0f57 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+001" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+034" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index e420b4e..366e847 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+001" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+034" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
+      <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
         <compilerSettings>
           <option name="additionalArguments" value="-Xallow-no-source-files" />
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.4/e97331cf473041be64301e6e7ebdc70700fdff24/spotbugs-annotations-4.0.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.13.1/3e949b65fa4224e78e3c513a54be56430b18ea6/rome-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.13.1/a59ce341139f0c58901127fab6445bd1c496af9/rome-utils-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.4/e97331cf473041be64301e6e7ebdc70700fdff24/spotbugs-annotations-4.0.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.13.1/3e949b65fa4224e78e3c513a54be56430b18ea6/rome-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.13.1/a59ce341139f0c58901127fab6445bd1c496af9/rome-utils-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
-          <option name="jvmTarget" value="9" />
+          <option name="jvmTarget" value="11" />
           <option name="languageVersion" value="1.3" />
           <option name="apiVersion" value="1.3" />
           <option name="pluginOptions">
@@ -66,6 +66,7 @@
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 6376829..03f4493 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+001" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+034" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.13.1/3e949b65fa4224e78e3c513a54be56430b18ea6/rome-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.4/e97331cf473041be64301e6e7ebdc70700fdff24/spotbugs-annotations-4.0.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.13.1/a59ce341139f0c58901127fab6445bd1c496af9/rome-utils-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.13.1/3e949b65fa4224e78e3c513a54be56430b18ea6/rome-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.4/e97331cf473041be64301e6e7ebdc70700fdff24/spotbugs-annotations-4.0.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/3.3.3/4878395d4e63173f3825e17e5e0690e8054445f1/mockito-core-3.3.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.13.1/a59ce341139f0c58901127fab6445bd1c496af9/rome-utils-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/1.10.5/d39f2a6c7a3550e03fb12a870e0829b0fa87f036/byte-buddy-1.10.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.10.5/d1c949ee74c3421ffd3d9159c867777ded928448/byte-buddy-agent-1.10.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.6/639033469776fd37c08358c6b92a4761feb2af4b/objenesis-2.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -47,6 +47,7 @@
     <content url="file://$MODULE_DIR$/../../src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -66,10 +67,12 @@
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.4" level="project" />
     <orderEntry type="library" name="Gradle: org.testng:testng:7.2.0" level="project" />
     <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.16.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.mockito:mockito-core:3.3.3" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
@@ -86,6 +89,9 @@
     <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.10.3" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.21" level="project" />
+    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy:1.10.5" level="project" />
+    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy-agent:1.10.5" level="project" />
+    <orderEntry type="library" name="Gradle: org.objenesis:objenesis:2.6" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:guava:25.1-android" level="project" />
     <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
diff --git a/build.gradle b/build.gradle
index 05cf95e..0d779ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,9 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.28.0'
-    id 'com.github.spotbugs' version '4.3.0'
+    id 'com.github.spotbugs' version '4.4.1'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.9.1'
+    id 'io.gitlab.arturbosch.detekt' version '1.10.0-RC1'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
@@ -63,15 +63,18 @@ dependencies {
 
     implementation platform('org.jetbrains.kotlin:kotlin-bom')
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7")
 
     testImplementation 'org.testng:testng:7.2.0'
     testImplementation 'org.assertj:assertj-core:3.16.1'
+    testImplementation 'org.mockito:mockito-core:3.3.3'
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
     spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
 
     compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
     testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
+
 }
 
 test {
@@ -81,13 +84,13 @@ test {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_9
-    targetCompatibility = JavaVersion.VERSION_1_9
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 compileKotlin {
     kotlinOptions {
-        jvmTarget = '9'
+        jvmTarget = '11'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4f0001..622ab64 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From c88be2b4e54cebf8dcb3967d9fec8b86d57b1482 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 19 Jun 2020 14:32:29 -0700
Subject: [PATCH 059/262] JDK 11 min requirements because of LTS.

---
 .circleci/config.yml                          |  8 +++---
 .idea/compiler.xml                            |  2 +-
 .idea/mobibot.iml                             |  2 +-
 .idea/modules/mobibot.main.iml                |  6 ++---
 .idea/modules/mobibot.test.iml                |  2 +-
 .travis.yml                                   |  4 +--
 build.gradle                                  |  1 -
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |  6 ++---
 .../thauvin/erik/mobibot/PinboardUtilsTest.kt | 25 +++----------------
 version.properties                            |  6 ++---
 10 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2926e9b..6d2102a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,15 +34,15 @@ jobs:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:14.0
+      - image: cimg/openjdk:14.0.1
 
     <<: *defaults_gradle
 
-  build_gradle_jdk9:
+  build_gradle_jdk11:
     <<: *defaults
 
     docker:
-      - image: circleci/openjdk:9
+      - image: circleci/openjdk:11.0.7
 
     <<: *defaults_gradle
 
@@ -50,6 +50,6 @@ workflows:
   version: 2
   gradle:
         jobs:
-        - build_gradle_jdk9
+        - build_gradle_jdk11
         - build_gradle_jdk14
 
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1f720ec..5a0b3ad 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,6 +12,6 @@
         <module name="mobibot.main" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="1.9" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index fbe0f57..92add17 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+034" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+043" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 366e847..636f6cf 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+034" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+043" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
+      <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
         <compilerSettings>
           <option name="additionalArguments" value="-Xallow-no-source-files" />
         </compilerSettings>
@@ -12,7 +12,7 @@
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
-          <option name="jvmTarget" value="11" />
+          <option name="jvmTarget" value="9" />
           <option name="languageVersion" value="1.3" />
           <option name="apiVersion" value="1.3" />
           <option name="pluginOptions">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 03f4493..3938301 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+034" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+043" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/.travis.yml b/.travis.yml
index 10d46d9..dd5e66d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ addons:
     organization: "ethauvin-github"
 
 jdk:
-  - oraclejdk9
+  - openjdk11
   - openjdk14
 
 before_install:
@@ -21,6 +21,6 @@ before_install:
 
 after_success:
   - |
-      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == oraclejdk9 ]; then
+      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == openjdk11 ]; then
         ./gradlew sonarqube
       fi
diff --git a/build.gradle b/build.gradle
index 0d779ef..11a21b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,7 +74,6 @@ dependencies {
 
     compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
     testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
-
 }
 
 test {
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 06bb921..1cb9672 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592043035449L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592615322387L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "beta";
-    public static final String BUILDMETA = "004";
-    public static final String VERSION = "0.8.0-beta+004";
+    public static final String BUILDMETA = "046";
+    public static final String VERSION = "0.8.0-beta+046";
 
     /**
      * Disables the default constructor.
diff --git a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index a8eed6c..4c33ece 100644
--- a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -36,18 +36,12 @@ import net.thauvin.erik.mobibot.entries.EntryLink
 import net.thauvin.erik.pinboard.PinboardPoster
 import org.testng.Assert
 import org.testng.annotations.Test
-import java.io.IOException
-import java.net.URI
-import java.net.URISyntaxException
+import java.net.URL
 import java.net.URLEncoder
-import java.net.http.HttpClient
-import java.net.http.HttpRequest
-import java.net.http.HttpResponse
 import java.nio.charset.StandardCharsets
 
 class PinboardUtilsTest : LocalProperties() {
     @Test
-    @Throws(InterruptedException::class, IOException::class, URISyntaxException::class)
     fun pinboardTest() {
         val apiToken = getProperty("pinboard-api-token")
         val pinboard = PinboardPoster(apiToken)
@@ -66,21 +60,10 @@ class PinboardUtilsTest : LocalProperties() {
         Assert.assertFalse(validatePin(apiToken, url = entry.link), "delete")
     }
 
-    @Throws(IOException::class, URISyntaxException::class, InterruptedException::class)
     private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean {
-        val request = HttpRequest.newBuilder().uri(
-            URI(
-                "https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
-                    + URLEncoder.encode(url, StandardCharsets.UTF_8)
-            )
-        ).GET().build()
+        val response = Utils.urlReader(URL("https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
+                                + URLEncoder.encode(url, StandardCharsets.UTF_8)))
 
-        val response = HttpClient.newBuilder()
-            .build()
-            .send(request, HttpResponse.BodyHandlers.ofString())
-
-        return if (response.statusCode() == 200) {
-            response.body().contains(url) && response.body().contains(ircServer)
-        } else false
+        return response.contains(url) && response.contains(ircServer)
     }
 }
diff --git a/version.properties b/version.properties
index 3a1fdac..a5f2ba8 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Jun 13 03:10:34 PDT 2020
-version.buildmeta=004
+#Fri Jun 19 18:08:41 PDT 2020
+version.buildmeta=046
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+004
+version.semver=0.8.0-beta+046

From 6b615cf1413a592dce7c3929507c8d50b8cdefc7 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 19 Jun 2020 19:04:59 -0700
Subject: [PATCH 060/262] OpenJDK 11.0.7 for CircleCI.

---
 .circleci/config.yml                                        | 2 +-
 .idea/compiler.xml                                          | 2 +-
 .idea/mobibot.iml                                           | 2 +-
 .idea/modules/mobibot.main.iml                              | 6 +++---
 .idea/modules/mobibot.test.iml                              | 2 +-
 .../java/net/thauvin/erik/mobibot/ReleaseInfo.java          | 6 +++---
 version.properties                                          | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6d2102a..6492ce2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,7 +42,7 @@ jobs:
     <<: *defaults
 
     docker:
-      - image: circleci/openjdk:11.0.7
+      - image: cimg/openjdk:11.0.7
 
     <<: *defaults_gradle
 
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5a0b3ad..1f720ec 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,6 +12,6 @@
         <module name="mobibot.main" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel target="1.9" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 92add17..366bd5f 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+043" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+046" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 636f6cf..61b4de2 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+043" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+046" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
+      <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
         <compilerSettings>
           <option name="additionalArguments" value="-Xallow-no-source-files" />
         </compilerSettings>
@@ -12,7 +12,7 @@
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
-          <option name="jvmTarget" value="9" />
+          <option name="jvmTarget" value="11" />
           <option name="languageVersion" value="1.3" />
           <option name="apiVersion" value="1.3" />
           <option name="pluginOptions">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 3938301..5ebfad1 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+043" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+046" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 1cb9672..9de1107 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -14,13 +14,13 @@ import java.time.*;
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592615322387L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592617191604L), ZoneId.systemDefault());
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
     public static final String PRERELEASE = "beta";
-    public static final String BUILDMETA = "046";
-    public static final String VERSION = "0.8.0-beta+046";
+    public static final String BUILDMETA = "047";
+    public static final String VERSION = "0.8.0-beta+047";
 
     /**
      * Disables the default constructor.
diff --git a/version.properties b/version.properties
index a5f2ba8..beae2a7 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Jun 19 18:08:41 PDT 2020
-version.buildmeta=046
+#Fri Jun 19 18:39:50 PDT 2020
+version.buildmeta=047
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+046
+version.semver=0.8.0-beta+047

From 8d33ddc2523251bb9187574e3372a64058dc0c7a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 20 Jun 2020 11:07:51 -0700
Subject: [PATCH 061/262] Fixed copyright.

---
 src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt     | 4 ++--
 src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
index b12a85f..3456a8d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -1,7 +1,7 @@
 /*
- * Pinboard.java
+ * PinboardUtils.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index 4c33ece..b79ff3d 100644
--- a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -1,5 +1,5 @@
 /*
- * PinboardTest.kt
+ * PinboardUtilsTest.kt
  *
  * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -62,7 +62,7 @@ class PinboardUtilsTest : LocalProperties() {
 
     private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean {
         val response = Utils.urlReader(URL("https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
-                                + URLEncoder.encode(url, StandardCharsets.UTF_8)))
+                                + Utils.encodeUrl(url)))
 
         return response.contains(url) && response.contains(ircServer)
     }

From 875269f5a60cecb4d07b345e0e5ed4b4b6f6af00 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 20 Jun 2020 11:09:21 -0700
Subject: [PATCH 062/262] Added Utils.encodeUrl()

---
 src/main/java/net/thauvin/erik/mobibot/Utils.java   | 11 +++++++++++
 .../thauvin/erik/mobibot/modules/GoogleSearch.java  |  6 +-----
 .../net/thauvin/erik/mobibot/modules/Weather2.java  | 13 +++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java
index 3d0632a..69bd6a9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.java
@@ -42,6 +42,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -116,6 +117,16 @@ public final class Utils {
         return colorize(s, Colors.CYAN);
     }
 
+    /**
+     * URL encodes the given string.
+     *
+     * @param s The string to encode.
+     * @return The encoded string.
+     */
+    public static String encodeUrl(final String s) {
+        return URLEncoder.encode(s, StandardCharsets.UTF_8);
+    }
+
     /**
      * Ensures that the given location (File/URL) has a trailing slash (<code>/</code>) to indicate a directory.
      *
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
index a36789f..478a64e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
@@ -44,8 +44,6 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -98,15 +96,13 @@ public final class GoogleSearch extends ThreadedModule {
         if (StringUtils.isNotBlank(query)) {
             final ArrayList<Message> results = new ArrayList<>();
             try {
-                final String q = URLEncoder.encode(query, StandardCharsets.UTF_8.toString());
-
                 final URL url =
                         new URL("https://www.googleapis.com/customsearch/v1?key="
                                 + apiKey
                                 + "&cx="
                                 + cseKey
                                 + "&q="
-                                + q
+                                + Utils.encodeUrl(query)
                                 + "&filter=1&num=5&alt=json");
 
                 final JSONObject json = new JSONObject(Utils.urlReader(url));
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
index a0894d0..9ef1426 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
@@ -44,13 +44,11 @@ import net.thauvin.erik.mobibot.msg.ErrorMessage;
 import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.NoticeMessage;
 import net.thauvin.erik.mobibot.msg.PublicMessage;
-import okhttp3.HttpUrl;
 import org.apache.commons.lang3.StringUtils;
 import org.jibble.pircbot.Colors;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 import static net.thauvin.erik.mobibot.Utils.bold;
 
@@ -185,14 +183,9 @@ public class Weather2 extends ThreadedModule {
                                 messages.add(new NoticeMessage("https://openweathermap.org/city/" + cwd.getCityId(),
                                                                Colors.GREEN));
                             } else {
-                                final HttpUrl url = Objects.requireNonNull(HttpUrl.parse(
-                                        "https://openweathermap.org/find"))
-                                                           .newBuilder()
-                                                           .addQueryParameter("q",
-                                                                              city + ','
-                                                                              + StringUtils.upperCase(country))
-                                                           .build();
-                                messages.add(new NoticeMessage(url.toString(), Colors.GREEN));
+                                final String url = "https://openweathermap.org/find?q=" +
+                                                   Utils.encodeUrl(city + ',' + StringUtils.upperCase(country));
+                                messages.add(new NoticeMessage(url, Colors.GREEN));
                             }
                         }
                     }

From 8f35d050dfaac74a2de8cb4f0a9fa5ca16d7c256 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 20 Jun 2020 17:09:58 -0700
Subject: [PATCH 063/262] Removed okhttp3 dependency, using Utils.readUrl()
 isntead.

---
 build.gradle                                  |  4 +-
 .../erik/mobibot/modules/StockQuote.java      | 84 +++++++++----------
 .../erik/mobibot/modules/Weather2.java        |  5 +-
 3 files changed, 42 insertions(+), 51 deletions(-)

diff --git a/build.gradle b/build.gradle
index 11a21b5..5925622 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,7 +48,7 @@ dependencies {
     implementation 'commons-cli:commons-cli:1.4'
 
     implementation 'commons-net:commons-net:3.6'
-    implementation 'com.squareup.okhttp3:okhttp:4.7.2'
+    //implementation 'com.squareup.okhttp3:okhttp:4.7.2'
 
     implementation 'com.rometools:rome:1.13.1'
 
@@ -63,7 +63,7 @@ dependencies {
 
     implementation platform('org.jetbrains.kotlin:kotlin-bom')
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7")
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
 
     testImplementation 'org.testng:testng:7.2.0'
     testImplementation 'org.assertj:assertj-core:3.16.1'
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
index 03b6ebb..4e5c1c9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
@@ -39,18 +39,15 @@ import net.thauvin.erik.mobibot.msg.ErrorMessage;
 import net.thauvin.erik.mobibot.msg.Message;
 import net.thauvin.erik.mobibot.msg.NoticeMessage;
 import net.thauvin.erik.mobibot.msg.PublicMessage;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * The StockQuote module.
@@ -88,43 +85,39 @@ public final class StockQuote extends ThreadedModule {
 
     @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
                         justification = "false positive?")
-    private static JSONObject getJsonResponse(final Response response, final String debugMessage)
-            throws IOException, ModuleException {
-        if (response.isSuccessful()) {
-            if (response.body() != null) {
-                final JSONObject json = new JSONObject(Objects.requireNonNull(response.body()).string());
+    private static JSONObject getJsonResponse(final String response, final String debugMessage)
+            throws ModuleException {
+        if (StringUtils.isNotBlank(response)) {
+            final JSONObject json = new JSONObject(response);
 
-                try {
-                    final String info = json.getString("Information");
-                    if (!info.isEmpty()) {
-                        throw new ModuleException(debugMessage, Utils.unescapeXml(info));
-                    }
-                } catch (JSONException ignore) {
-                    // Do nothing
+            try {
+                final String info = json.getString("Information");
+                if (!info.isEmpty()) {
+                    throw new ModuleException(debugMessage, Utils.unescapeXml(info));
                 }
-
-                try {
-                    final String error = json.getString("Note");
-                    if (!error.isEmpty()) {
-                        throw new ModuleException(debugMessage, Utils.unescapeXml(error));
-                    }
-                } catch (JSONException ignore) {
-                    // Do nothing
-                }
-
-                try {
-                    final String error = json.getString("Error Message");
-                    if (!error.isEmpty()) {
-                        throw new ModuleException(debugMessage, Utils.unescapeXml(error));
-                    }
-                } catch (JSONException ignore) {
-                    // Do nothing
-                }
-
-                return json;
-            } else {
-                throw new ModuleException(debugMessage, "Invalid Response (" + response.code() + ')');
+            } catch (JSONException ignore) {
+                // Do nothing
             }
+
+            try {
+                final String error = json.getString("Note");
+                if (!error.isEmpty()) {
+                    throw new ModuleException(debugMessage, Utils.unescapeXml(error));
+                }
+            } catch (JSONException ignore) {
+                // Do nothing
+            }
+
+            try {
+                final String error = json.getString("Error Message");
+                if (!error.isEmpty()) {
+                    throw new ModuleException(debugMessage, Utils.unescapeXml(error));
+                }
+            } catch (JSONException ignore) {
+                // Do nothing
+            }
+
+            return json;
         } else {
             throw new ModuleException(debugMessage, "Empty Response.");
         }
@@ -146,13 +139,13 @@ public final class StockQuote extends ThreadedModule {
         if (StringUtils.isNotBlank(symbol)) {
             final String debugMessage = "getQuote(" + symbol + ')';
             final ArrayList<Message> messages = new ArrayList<>();
-            final OkHttpClient client = new OkHttpClient();
 
+            String response;
             try {
                 // Search for symbol/keywords
-                Request request = new Request.Builder().url(
-                        ALAPHAVANTAGE_URL + "SYMBOL_SEARCH&keywords=" + symbol + "&apikey=" + apiKey).build();
-                Response response = client.newCall(request).execute();
+                response = Utils.urlReader(new URL(
+                        ALAPHAVANTAGE_URL + "SYMBOL_SEARCH&keywords=" + Utils.encodeUrl(symbol) + "&apikey="
+                        + Utils.encodeUrl(apiKey)));
 
                 JSONObject json = getJsonResponse(response, debugMessage);
 
@@ -165,10 +158,9 @@ public final class StockQuote extends ThreadedModule {
                 final JSONObject symbolInfo = symbols.getJSONObject(0);
 
                 // Get quote for symbol
-                request = new Request.Builder().url(
-                        ALAPHAVANTAGE_URL + "GLOBAL_QUOTE&symbol=" + symbolInfo.getString("1. symbol") + "&apikey="
-                        + apiKey).build();
-                response = client.newCall(request).execute();
+                response = Utils.urlReader(new URL(
+                        ALAPHAVANTAGE_URL + "GLOBAL_QUOTE&symbol=" + Utils.encodeUrl(symbolInfo.getString("1. symbol"))
+                        + "&apikey=" + Utils.encodeUrl(apiKey)));
 
                 json = getJsonResponse(response, debugMessage);
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
index 9ef1426..e1910ac 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
@@ -183,9 +183,8 @@ public class Weather2 extends ThreadedModule {
                                 messages.add(new NoticeMessage("https://openweathermap.org/city/" + cwd.getCityId(),
                                                                Colors.GREEN));
                             } else {
-                                final String url = "https://openweathermap.org/find?q=" +
-                                                   Utils.encodeUrl(city + ',' + StringUtils.upperCase(country));
-                                messages.add(new NoticeMessage(url, Colors.GREEN));
+                                messages.add(new NoticeMessage("https://openweathermap.org/find?q=" + Utils.encodeUrl(
+                                        city + ',' + StringUtils.upperCase(country)), Colors.GREEN));
                             }
                         }
                     }

From 52c5e2dba792cb8ac2223e6a734ddab6bfc6a37c Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 20 Jun 2020 20:21:56 -0700
Subject: [PATCH 064/262] Cleanup.

---
 .../net/thauvin/erik/mobibot/commands/Versions.java    |  7 +++----
 .../java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt | 10 ++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 7b80f3d..37491da 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 public class Versions extends AbstractCommand {
-    private final List<String> versions =
+    private final List<String> verList =
             List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
                     "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
                     + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
@@ -64,8 +64,7 @@ public class Versions extends AbstractCommand {
     @NotNull
     @Override
     public List<String> getHelp() {
-        return List.of("To view the versions data (bot, java, etc.):",
-                       Utils.helpIndent("%s " + getName()));
+        return List.of("To view the versions data (bot, platform, java, etc.):", Utils.helpIndent("%c " + getName()));
     }
 
     @Override
@@ -90,7 +89,7 @@ public class Versions extends AbstractCommand {
                                 final boolean isOp,
                                 final boolean isPrivate) {
         if (isOp) {
-            for (final String v : versions) {
+            for (final String v : verList) {
                 getBot().send(sender, v, isPrivate);
             }
         } else {
diff --git a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index b79ff3d..5f58c91 100644
--- a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -37,8 +37,6 @@ import net.thauvin.erik.pinboard.PinboardPoster
 import org.testng.Assert
 import org.testng.annotations.Test
 import java.net.URL
-import java.net.URLEncoder
-import java.nio.charset.StandardCharsets
 
 class PinboardUtilsTest : LocalProperties() {
     @Test
@@ -61,8 +59,12 @@ class PinboardUtilsTest : LocalProperties() {
     }
 
     private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean {
-        val response = Utils.urlReader(URL("https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
-                                + Utils.encodeUrl(url)))
+        val response = Utils.urlReader(
+            URL(
+                "https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
+                    + Utils.encodeUrl(url)
+            )
+        )
 
         return response.contains(url) && response.contains(ircServer)
     }

From 1749a081deb9dfd404fbbfd9ee06253a48e903f8 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 11 Jul 2020 18:29:46 -0700
Subject: [PATCH 065/262] Updated dependencies.

---
 .idea/mobibot.iml                        |  2 +-
 .idea/modules/mobibot.main.iml           | 22 +++++++++++-----------
 .idea/modules/mobibot.test.iml           | 22 +++++++++++-----------
 build.gradle                             | 12 ++++++------
 config/pmd.xml                           |  3 +--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 6 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 366bd5f..d9eb8b4 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+046" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+068" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 61b4de2..d3ec72e 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+046" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+068" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.4/e97331cf473041be64301e6e7ebdc70700fdff24/spotbugs-annotations-4.0.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.13.1/3e949b65fa4224e78e3c513a54be56430b18ea6/rome-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.13.1/a59ce341139f0c58901127fab6445bd1c496af9/rome-utils-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.6/23f028bcf9842e9ea63d23eabe408e0fbe7432b4/spotbugs-annotations-4.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.14.1/6e19be853792088096ba147150a6db5ced43e2d2/rome-1.14.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.14.1/a0f9e927afe54ef682f1859afed310147bc12612/rome-utils-1.14.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -51,34 +51,34 @@
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.7.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.13.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.14.1" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
+    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.14.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 5ebfad1..9de0d17 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+046" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+068" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/4.7.2/c9acfd63537db1d7d21d98a7405e22449bb881d6/okhttp-4.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.13.1/3e949b65fa4224e78e3c513a54be56430b18ea6/rome-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.6.0/f06923d428f3c8e6f571043ec29a45d0cd9d2bf/okio-jvm-2.6.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.4/e97331cf473041be64301e6e7ebdc70700fdff24/spotbugs-annotations-4.0.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/3.3.3/4878395d4e63173f3825e17e5e0690e8054445f1/mockito-core-3.3.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.13.1/a59ce341139f0c58901127fab6445bd1c496af9/rome-utils-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/1.10.5/d39f2a6c7a3550e03fb12a870e0829b0fa87f036/byte-buddy-1.10.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.10.5/d1c949ee74c3421ffd3d9159c867777ded928448/byte-buddy-agent-1.10.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.6/639033469776fd37c08358c6b92a4761feb2af4b/objenesis-2.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.14.1/6e19be853792088096ba147150a6db5ced43e2d2/rome-1.14.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.6/23f028bcf9842e9ea63d23eabe408e0fbe7432b4/spotbugs-annotations-4.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/3.3.3/4878395d4e63173f3825e17e5e0690e8054445f1/mockito-core-3.3.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.14.1/a0f9e927afe54ef682f1859afed310147bc12612/rome-utils-1.14.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/1.10.5/d39f2a6c7a3550e03fb12a870e0829b0fa87f036/byte-buddy-1.10.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.10.5/d1c949ee74c3421ffd3d9159c867777ded928448/byte-buddy-agent-1.10.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.6/639033469776fd37c08358c6b92a4761feb2af4b/objenesis-2.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -59,28 +59,27 @@
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.7.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.13.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.14.1" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
+    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.testng:testng:7.2.0" level="project" />
     <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.16.1" level="project" />
     <orderEntry type="library" name="Gradle: org.mockito:mockito-core:3.3.3" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.14.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
@@ -92,6 +91,7 @@
     <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy:1.10.5" level="project" />
     <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy-agent:1.10.5" level="project" />
     <orderEntry type="library" name="Gradle: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:guava:25.1-android" level="project" />
     <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
diff --git a/build.gradle b/build.gradle
index 5925622..c6b72b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,9 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.28.0'
-    id 'com.github.spotbugs' version '4.4.1'
+    id 'com.github.spotbugs' version '4.4.4'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.10.0-RC1'
+    id 'io.gitlab.arturbosch.detekt' version '1.10.0'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
@@ -23,7 +23,7 @@ mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
     log4j   : '2.13.3',
-    spotbugs: '4.0.4'
+    spotbugs: '4.0.6'
 ]
 
 repositories {
@@ -50,7 +50,7 @@ dependencies {
     implementation 'commons-net:commons-net:3.6'
     //implementation 'com.squareup.okhttp3:okhttp:4.7.2'
 
-    implementation 'com.rometools:rome:1.13.1'
+    implementation 'com.rometools:rome:1.14.1'
 
     implementation 'org.json:json:20200518'
     implementation 'org.jsoup:jsoup:1.13.1'
@@ -67,7 +67,7 @@ dependencies {
 
     testImplementation 'org.testng:testng:7.2.0'
     testImplementation 'org.assertj:assertj-core:3.16.1'
-    testImplementation 'org.mockito:mockito-core:3.3.3'
+    testImplementation 'org.mockito:mockito-core:3.4.0'
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
     spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
@@ -106,7 +106,7 @@ tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
 }
 
 pmd {
-    toolVersion = '6.24.0'
+    toolVersion = '6.25.0'
     ignoreFailures = true
     ruleSets = []
     ruleSetFiles = files("${projectDir}/config/pmd.xml")
diff --git a/config/pmd.xml b/config/pmd.xml
index 1233156..8d35af0 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -17,10 +17,9 @@
     <rule ref="category/java/bestpractices.xml/MissingOverride">
         <properties>
             <property name="violationSuppressXPath"
-                      value="./MethodDeclarator[@Image='hashCode' or @Image='equals' or @Image='toString']"/>
+                      value="//MethodDeclaration[@Name='hashCode' or @Name='equals' or @Name='toString']"/>
         </properties>
     </rule>
-    <rule ref="category/java/bestpractices.xml/LiteralsFirstInComparisons"/>
     <rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
     <rule ref="category/java/bestpractices.xml/ReplaceEnumerationWithIterator"/>
     <!-- <rule ref="category/java/bestpractices.xml/ReplaceHashtableWithMap"/>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 622ab64..bb8b2fc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 044f1b85b71c4a2cd7c8b9ea5279ae506d702ef1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 11 Jul 2020 18:32:30 -0700
Subject: [PATCH 066/262] shutdown on autoPost only.

---
 .../java/net/thauvin/erik/mobibot/modules/Twitter.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
index 7728a9f..87446a5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
@@ -86,7 +86,7 @@ public final class Twitter extends ThreadedModule {
         help.add(Utils.helpIndent("%c " + TWITTER_CMD + " <message>"));
 
         properties.put(AUTOPOST_PROP, "false");
-        initProperties(CONSUMER_KEY_PROP,CONSUMER_SECRET_PROP,HANDLE_PROP,TOKEN_PROP,TOKEN_SECRET_PROP);
+        initProperties(CONSUMER_KEY_PROP, CONSUMER_SECRET_PROP, HANDLE_PROP, TOKEN_PROP, TOKEN_SECRET_PROP);
     }
 
     /**
@@ -270,8 +270,10 @@ public final class Twitter extends ThreadedModule {
      * Post all the entries to Twitter on shutdown.
      */
     public final void shutdown() {
-        for (final int index : entries) {
-            postEntry(index);
+        if (isAutoPost()) {
+            for (final int index : entries) {
+                postEntry(index);
+            }
         }
     }
 }

From 8b4b0d7dd1f799a98583f2c5b4dce44cefb96792 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 11 Jul 2020 18:32:57 -0700
Subject: [PATCH 067/262] Cleanup.

---
 src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt | 2 +-
 website/index.html                                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
index a313b01..28b57c9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -73,7 +73,7 @@ class Tags(bot: Mobibot) : AbstractCommand(bot) {
                     bot.send(EntriesUtils.buildTags(index, entry))
                     LinksMgr.saveEntries(bot, false)
                 } else {
-                    bot.send(sender, "Please ask a channel op to change the tags for you.",isPrivate)
+                    bot.send(sender, "Please ask a channel op to change the tags for you.", isPrivate)
                 }
             } else {
                 if (entry.hasTags()) {
diff --git a/website/index.html b/website/index.html
index a934ecd..6dfd579 100644
--- a/website/index.html
+++ b/website/index.html
@@ -103,7 +103,7 @@
             <div><code>mobibot: joke</code></div>
         </li>
         <li>Rolling dice and playing war
-            <div><code>mobibot: dice</code><div>
+            <div><code>mobibot: dice</code></div>
             <div><code>mobibot: war</code></div>
         </li>
         <li>Posting to <a href="https://twitter.com/mobitopia">Twitter</a></li>

From 62417e76f73ae4b93c6180bfa62c76f9c5d1a458 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 15 Jul 2020 18:34:33 -0700
Subject: [PATCH 068/262] Updated dependencies.

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c6b72b7..326c5a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     implementation 'commons-net:commons-net:3.6'
     //implementation 'com.squareup.okhttp3:okhttp:4.7.2'
 
-    implementation 'com.rometools:rome:1.14.1'
+    implementation 'com.rometools:rome:1.15.0'
 
     implementation 'org.json:json:20200518'
     implementation 'org.jsoup:jsoup:1.13.1'

From aea73acce5ee47a8db4d17f974f13f6b37a5947d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 21 Jul 2020 17:57:58 -0700
Subject: [PATCH 069/262] Reworked info command.

---
 .idea/mobibot.iml                             |   2 +-
 .idea/modules/mobibot.main.iml                |  10 +-
 .idea/modules/mobibot.test.iml                |  16 +--
 mobibot.mustache                              |   9 +-
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |  11 +-
 .../net/thauvin/erik/mobibot/Mobibot.java     |  21 +---
 .../thauvin/erik/mobibot/commands/Info.java   | 115 ++++++++++++++++++
 .../net/thauvin/erik/mobibot/commands/Info.kt |  86 -------------
 version.mustache                              |   9 +-
 9 files changed, 157 insertions(+), 122 deletions(-)
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Info.java
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Info.kt

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index d9eb8b4..ace356b 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+068" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+071" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index d3ec72e..ec0fc30 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+068" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+071" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.6/23f028bcf9842e9ea63d23eabe408e0fbe7432b4/spotbugs-annotations-4.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.14.1/6e19be853792088096ba147150a6db5ced43e2d2/rome-1.14.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.14.1/a0f9e927afe54ef682f1859afed310147bc12612/rome-utils-1.14.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.6/23f028bcf9842e9ea63d23eabe408e0fbe7432b4/spotbugs-annotations-4.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -55,10 +55,10 @@
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.14.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
@@ -69,7 +69,7 @@
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.14.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 9de0d17..46615ee 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+068" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+071" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.10/e155460aaf5b464062a09c3923f089ce99128a17/commons-lang3-3.10.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.14.1/6e19be853792088096ba147150a6db5ced43e2d2/rome-1.14.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.6/23f028bcf9842e9ea63d23eabe408e0fbe7432b4/spotbugs-annotations-4.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/3.3.3/4878395d4e63173f3825e17e5e0690e8054445f1/mockito-core-3.3.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.14.1/a0f9e927afe54ef682f1859afed310147bc12612/rome-utils-1.14.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/1.10.5/d39f2a6c7a3550e03fb12a870e0829b0fa87f036/byte-buddy-1.10.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.10.5/d1c949ee74c3421ffd3d9159c867777ded928448/byte-buddy-agent-1.10.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.6/639033469776fd37c08358c6b92a4761feb2af4b/objenesis-2.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.6/23f028bcf9842e9ea63d23eabe408e0fbe7432b4/spotbugs-annotations-4.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/3.4.4/6213e9c1b25a845167e27a51e6b6886b4306a920/mockito-core-3.4.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/1.10.13/1426b15be5954246a9a72fd4baae1f42b9a4f45d/byte-buddy-1.10.13.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.10.13/f5b939963d13be46c101a3c12bf49aa23abb191/byte-buddy-agent-1.10.13.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.6/639033469776fd37c08358c6b92a4761feb2af4b/objenesis-2.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -56,10 +56,10 @@
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
     <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.14.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
@@ -71,9 +71,9 @@
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.testng:testng:7.2.0" level="project" />
     <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.16.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.mockito:mockito-core:3.3.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.mockito:mockito-core:3.4.4" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.14.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
@@ -88,8 +88,8 @@
     <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.10.3" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.21" level="project" />
-    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy:1.10.5" level="project" />
-    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy-agent:1.10.5" level="project" />
+    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy:1.10.13" level="project" />
+    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" />
     <orderEntry type="library" name="Gradle: org.objenesis:objenesis:2.6" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" level="project" />
diff --git a/mobibot.mustache b/mobibot.mustache
index 5314f35..a090f01 100644
--- a/mobibot.mustache
+++ b/mobibot.mustache
@@ -13,14 +13,19 @@ import java.time.*;
  */
 public final class {{className}} {
     public static final String PROJECT = "{{project}}";
+    public static final String VERSION = "{{version}}";
     public static final LocalDateTime BUILDDATE =
         LocalDateTime.ofInstant(Instant.ofEpochMilli({{epoch}}L), ZoneId.systemDefault());
+
     public static final int MAJOR = {{major}};
     public static final int MINOR = {{minor}};
     public static final int PATCH = {{patch}};
-    public static final String PRERELEASE = "{{preRelease}}";
     public static final String BUILDMETA = "{{buildMeta}}";
-    public static final String VERSION = "{{version}}";
+    public static final String PRERELEASE = "{{preRelease}}";
+
+    public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
+    public static final String AUTHOR = "Erik C. Thauvin";
+    public static final String AUTHOR_URL = "https://erik.thauvin.net/";
 
     /**
      * Disables the default constructor.
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 9de1107..f1d555b 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -13,14 +13,19 @@ import java.time.*;
  */
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
+    public static final String VERSION = "0.8.0-beta+085";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1592617191604L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1595378887339L), ZoneId.systemDefault());
+
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
+    public static final String BUILDMETA = "085";
     public static final String PRERELEASE = "beta";
-    public static final String BUILDMETA = "047";
-    public static final String VERSION = "0.8.0-beta+047";
+
+    public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
+    public static final String AUTHOR = "Erik C. Thauvin";
+    public static final String AUTHOR_URL = "https://erik.thauvin.net/";
 
     /**
      * Disables the default constructor.
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index df34caa..7f1bb5d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -114,15 +114,6 @@ import static org.apache.commons.lang3.StringUtils.lowerCase;
 @Version(properties = "version.properties",
          className = "ReleaseInfo")
 public class Mobibot extends PircBot {
-    /**
-     * Info Strings.
-     */
-    @SuppressWarnings("indentation")
-    public static final List<String> INFO =
-            List.of(
-                    ReleaseInfo.PROJECT + " v" + ReleaseInfo.VERSION
-                    + " (" + Utils.green("https://www.mobitopia.org/mobibot/") + ')',
-                    "Written by Erik C. Thauvin (" + Utils.green("https://erik.thauvin.net/") + ')');
     // Logger
     private static final Logger LOGGER = LogManager.getLogger(Mobibot.class);
     // Maximum number of times the bot will try to reconnect, if disconnected
@@ -303,9 +294,9 @@ public class Mobibot extends PircBot {
             // Output the usage
             new HelpFormatter().printHelp(Mobibot.class.getName(), options);
         } else if (commandLine.hasOption(Constants.VERSION_ARG.charAt(0))) {
-            for (final String s : INFO) {
-                System.out.println(s);
-            }
+            System.out.println(ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION
+                               + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')');
+            System.out.println(ReleaseInfo.WEBSITE);
         } else {
             final Properties p = new Properties();
 
@@ -413,7 +404,7 @@ public class Mobibot extends PircBot {
                 }
             }
         }
-        setVersion(INFO.get(0));
+        setVersion(ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION);
         identify();
         joinChannel();
     }
@@ -749,7 +740,7 @@ public class Mobibot extends PircBot {
         if (cmd.startsWith(Constants.HELP_CMD)) { // help
             helpResponse(sender, args, true);
         } else if (isOp && "kill".equals(cmd)) { // kill
-            twitter.notification("%1$s killed by " + sender + "on %3$s");
+            twitter.notification("%1$s killed by " + sender + " on %3$s");
             sendRawLine("QUIT : Poof!");
             System.exit(0);
         } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) { // debug
@@ -763,7 +754,7 @@ public class Mobibot extends PircBot {
             send(sender + " has just signed my death sentence.");
             TIMER.cancel();
             twitter.shutdown();
-            twitter.notification("%1$s stopped by " + sender + "on %3$s");
+            twitter.notification("%1$s stopped by " + sender + " on %3$s");
             sleep(3);
             quitServer("The Bot Is Out There!");
             System.exit(0);
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
new file mode 100644
index 0000000..2beab74
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -0,0 +1,115 @@
+/*
+ * InfoJ.java
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands;
+
+import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.ReleaseInfo;
+import net.thauvin.erik.mobibot.Utils;
+import net.thauvin.erik.mobibot.commands.links.LinksMgr;
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.management.ManagementFactory;
+import java.util.List;
+
+public class Info extends AbstractCommand {
+    private final List<String> version = List.of(
+            StringUtils.capitalize(ReleaseInfo.PROJECT) + " " + ReleaseInfo.VERSION + " ("
+            + Utils.green(ReleaseInfo.WEBSITE) + ')',
+            "Written by " + ReleaseInfo.AUTHOR + " (" + Utils.green(ReleaseInfo.AUTHOR_URL) + ')');
+
+    public Info(@NotNull final Mobibot bot) {
+        super(bot);
+    }
+
+    @NotNull
+    @Override
+    public String getName() {
+        return "info";
+    }
+
+    @NotNull
+    @Override
+    public List<String> getHelp() {
+        return List.of("To view information about the bot:", Utils.helpIndent("%c " + getName()));
+    }
+
+    @Override
+    public boolean isOp() {
+        return false;
+    }
+
+    @Override
+    public boolean isPublic() {
+        return true;
+    }
+
+    @Override
+    public boolean isVisible() {
+        return true;
+    }
+
+    @Override
+    public void commandResponse(@NotNull final String sender,
+                                @NotNull final String login,
+                                @NotNull final String args,
+                                final boolean isOp,
+                                final boolean isPrivate) {
+        for (final String v : version) {
+            getBot().send(sender, v, isPrivate);
+        }
+
+        final StringBuilder info = new StringBuilder("Uptime: ");
+
+        info.append(Utils.uptime(ManagementFactory.getRuntimeMXBean().getUptime()))
+            .append(" [Entries: ")
+            .append(LinksMgr.getEntriesCount());
+
+        if (isOp) {
+            if (getBot().getTell().isEnabled()) {
+                info.append(", Messages: ")
+                    .append(getBot().getTell().size());
+            }
+            if (getBot().getTwitter().isAutoPost()) {
+                info.append(", Twitter: ")
+                    .append(getBot().getTwitter().entriesCount());
+            }
+        }
+
+        info.append(", Recap: ")
+            .append(Recap.recapCount())
+            .append(']');
+
+        getBot().send(sender, info.toString(), isPrivate);
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
deleted file mode 100644
index 1698028..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Info.kt
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands
-
-import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
-import net.thauvin.erik.mobibot.commands.links.LinksMgr
-import java.lang.management.ManagementFactory
-
-class Info(bot: Mobibot) : AbstractCommand(bot) {
-    override val name = "info"
-    override val help = listOf(
-        "To view information about the bot:",
-        Utils.helpIndent("%c $name")
-    )
-    override val isOp = false
-    override val isPublic = true
-    override val isVisible = true
-
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        for (info in Mobibot.INFO) {
-            bot.send(sender, info, isPrivate)
-        }
-
-        val info = StringBuilder("Uptime: ")
-
-        with(info) {
-            append(Utils.uptime(ManagementFactory.getRuntimeMXBean().uptime))
-            append(" [Entries: ")
-            append(LinksMgr.entriesCount)
-
-            if (isOp) {
-                if (bot.tell.isEnabled()) {
-                    append(", Messages: ")
-                    append(bot.tell.size())
-                }
-                if (bot.twitter.isAutoPost) {
-                    append(", Twitter: ")
-                    append(bot.twitter.entriesCount())
-                }
-            }
-
-            append(", Recap: ")
-            append(Recap.recapCount())
-            append(']')
-        }
-
-        bot.send(sender, info.toString(), isPrivate)
-    }
-}
diff --git a/version.mustache b/version.mustache
index 5314f35..a090f01 100644
--- a/version.mustache
+++ b/version.mustache
@@ -13,14 +13,19 @@ import java.time.*;
  */
 public final class {{className}} {
     public static final String PROJECT = "{{project}}";
+    public static final String VERSION = "{{version}}";
     public static final LocalDateTime BUILDDATE =
         LocalDateTime.ofInstant(Instant.ofEpochMilli({{epoch}}L), ZoneId.systemDefault());
+
     public static final int MAJOR = {{major}};
     public static final int MINOR = {{minor}};
     public static final int PATCH = {{patch}};
-    public static final String PRERELEASE = "{{preRelease}}";
     public static final String BUILDMETA = "{{buildMeta}}";
-    public static final String VERSION = "{{version}}";
+    public static final String PRERELEASE = "{{preRelease}}";
+
+    public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
+    public static final String AUTHOR = "Erik C. Thauvin";
+    public static final String AUTHOR_URL = "https://erik.thauvin.net/";
 
     /**
      * Disables the default constructor.

From c65204414d7022408866d388fb4450bf74ef61a1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 21 Jul 2020 17:58:11 -0700
Subject: [PATCH 070/262] Updated dependencies.

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 326c5a2..9a91c0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'application'
     id 'checkstyle'
-    id 'com.github.ben-manes.versions' version '0.28.0'
+    id 'com.github.ben-manes.versions' version '0.29.0'
     id 'com.github.spotbugs' version '4.4.4'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.10.0'
@@ -43,7 +43,7 @@ dependencies {
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
 
-    implementation 'org.apache.commons:commons-lang3:3.10'
+    implementation 'org.apache.commons:commons-lang3:3.11'
     //implementation 'org.apache.commons:commons-text:1.8'
     implementation 'commons-cli:commons-cli:1.4'
 
@@ -67,7 +67,7 @@ dependencies {
 
     testImplementation 'org.testng:testng:7.2.0'
     testImplementation 'org.assertj:assertj-core:3.16.1'
-    testImplementation 'org.mockito:mockito-core:3.4.0'
+    testImplementation 'org.mockito:mockito-core:3.4.4'
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
     spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'

From 64d2328618e6ed398ec01f462e6cc81b45019bbe Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 26 Jul 2020 02:00:18 -0700
Subject: [PATCH 071/262] Added BitBucket and GitLab CIs. More code cleanup.

---
 .circleci/config.yml                          |  2 +-
 .github/workflows/gradle.yml                  | 26 +++++++++++++++
 .gitlab-ci.yml                                | 32 +++++++++++++++++++
 .travis.yml                                   |  2 +-
 bitbucket-pipelines.yml                       |  9 ++++++
 .../net/thauvin/erik/mobibot/Mobibot.java     |  5 ++-
 .../erik/mobibot/commands/ChannelFeed.kt      |  2 +-
 .../thauvin/erik/mobibot/commands/Info.java   |  4 +--
 .../erik/mobibot/commands/Versions.java       | 11 +++----
 .../erik/mobibot/modules/TwitterTest.java     |  7 ++--
 10 files changed, 81 insertions(+), 19 deletions(-)
 create mode 100644 .github/workflows/gradle.yml
 create mode 100644 .gitlab-ci.yml
 create mode 100644 bitbucket-pipelines.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6492ce2..20a8cc6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ defaults: &defaults
   environment:
     JVM_OPTS: -Xmx3200m
     TERM: dumb
-    CI: true
+    CI_NAME: "CircleCI"
 
 defaults_gradle: &defaults_gradle
   steps:
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
new file mode 100644
index 0000000..82c3591
--- /dev/null
+++ b/.github/workflows/gradle.yml
@@ -0,0 +1,26 @@
+name: Java CI with Gradle
+
+on:
+  push
+  pull_request
+  workflow_dispatch
+    
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Set environment variables
+      env:
+        CI_NAME: "GitHub CI"
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Test with Gradle
+      run: ./gradlew check
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..1e06d44
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,32 @@
+image: openjdk:11-jdk-slim
+
+variables:
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
+  CI_NAME: "GitLab CI"
+
+before_script:
+  - export GRADLE_USER_HOME=`pwd`/.gradle
+
+stages:
+  - build
+  - test
+
+build:
+  stage: build
+  script: ./gradlew --build-cache assemble
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    policy: push
+    paths:
+      - build
+      - .gradle
+
+test:
+  stage: test
+  script: ./gradlew check
+  cache:
+    key: "$CI_COMMIT_REF_NAME"
+    policy: pull
+    paths:
+      - build
+      - .gradle
diff --git a/.travis.yml b/.travis.yml
index dd5e66d..991c643 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 
 env:
   global:
-    - CI=true
+    - CI_NAME: "Travis CI"
 
 install:
   - git fetch --unshallow --tags
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
new file mode 100644
index 0000000..219c29f
--- /dev/null
+++ b/bitbucket-pipelines.yml
@@ -0,0 +1,9 @@
+image: openjdk:11
+
+pipelines:
+  default:
+    - step:
+        caches:
+          - gradle
+        script:
+          - bash ./gradlew check
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 7f1bb5d..1289405 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -188,12 +188,12 @@ public class Mobibot extends PircBot {
         setVerbose(true);
         setAutoNickChange(true);
         setLogin(p.getProperty("login", getName()));
-        setVersion(p.getProperty("weblog", ""));
+        setVersion(ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION);
         // setMessageDelay(1000);
         setIdentity(p.getProperty("ident", ""), p.getProperty("ident-nick", ""), p.getProperty("ident-msg", ""));
 
         // Set the URLs
-        setWeblogUrl(getVersion());
+        setWeblogUrl(p.getProperty("weblog", ""));
         setBacklogsUrl(Utils.ensureDir(p.getProperty("backlogs", weblogUrl), true));
 
         // Set the pinboard authentication
@@ -404,7 +404,6 @@ public class Mobibot extends PircBot {
                 }
             }
         }
-        setVersion(ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION);
         identify();
         joinChannel();
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index 1211fcb..f371422 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -62,7 +62,7 @@ class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
         isPrivate: Boolean
     ) {
         with(getProperty(FEED_PROP)) {
-            if (!this.isNullOrBlank()) {
+            if (!isNullOrBlank()) {
                 Thread(FeedReader(bot, sender, this)).start()
             } else {
                 bot.send(sender, "There is no feed setup for this channel.", false)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index 2beab74..aed639c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -44,8 +44,8 @@ import java.util.List;
 
 public class Info extends AbstractCommand {
     private final List<String> version = List.of(
-            StringUtils.capitalize(ReleaseInfo.PROJECT) + " " + ReleaseInfo.VERSION + " ("
-            + Utils.green(ReleaseInfo.WEBSITE) + ')',
+            StringUtils.capitalize(ReleaseInfo.PROJECT) + " " + ReleaseInfo.VERSION
+            + " (" + Utils.green(ReleaseInfo.WEBSITE) + ')',
             "Written by " + ReleaseInfo.AUTHOR + " (" + Utils.green(ReleaseInfo.AUTHOR_URL) + ')');
 
     public Info(@NotNull final Mobibot bot) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 37491da..4b08631 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -42,13 +42,10 @@ import java.util.List;
 public class Versions extends AbstractCommand {
     private final List<String> verList =
             List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
-                    "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
-                    + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
-                    "Runtime: " + System.getProperty("java.runtime.name") + " (build " + System.getProperty(
-                            "java.runtime.version") + ')',
-                    "VM: " + System.getProperty("java.vm.name") + " (build " + System.getProperty("java.vm.version")
-                    + ", "
-                    + System.getProperty("java.vm.info") + ')');
+                    "Platform: " + System.getProperty("os.name") + ' ' + System.getProperty("os.version")
+                    + " (" + System.getProperty("os.arch") + ')',
+                    "Runtime: " + System.getProperty("java.runtime.name")
+                    + ' ' + System.getProperty("java.runtime.version"));
 
     public Versions(@NotNull final Mobibot bot) {
         super(bot);
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
index 88782ad..2c14d2b 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
@@ -51,10 +51,9 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class TwitterTest extends LocalProperties {
     @SuppressFBWarnings("MDM")
     private String getCi() {
-        if ("true".equals(System.getenv("CIRCLECI"))) {
-            return "CircleCI";
-        } else if ("true".equals(System.getenv("TRAVIS"))) {
-            return "Travis CI";
+        final String ciName = System.getenv("CI_NAME");
+        if (ciName != null) {
+            return ciName;
         } else {
             try {
                 return InetAddress.getLocalHost().getHostName();

From fd9a5f83fe2c97354e57054063c2e3d94b15eb53 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 26 Jul 2020 16:04:42 -0700
Subject: [PATCH 072/262] Fixed push.

---
 .github/workflows/gradle.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 82c3591..acb273d 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -1,9 +1,9 @@
 name: Java CI with Gradle
 
 on:
-  push
-  pull_request
-  workflow_dispatch
+  push:
+  pull_request:
+  workflow_dispatch:
     
 
 jobs:

From ec066d62987fa4b446d89ae4a956a41147fbb09b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 26 Jul 2020 16:07:48 -0700
Subject: [PATCH 073/262] Fixed push, etc., again.

---
 .github/workflows/gradle.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index acb273d..2e56d13 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -1,10 +1,6 @@
 name: Java CI with Gradle
 
-on:
-  push:
-  pull_request:
-  workflow_dispatch:
-    
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:

From 71a3bb4dba03212c1dcb38b0bf3986625a576193 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 26 Jul 2020 16:15:18 -0700
Subject: [PATCH 074/262] Move env section.

---
 .github/workflows/gradle.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 2e56d13..37ec6ed 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -1,6 +1,7 @@
 name: Java CI with Gradle
 
 on: [push, pull_request, workflow_dispatch]
+    
 
 jobs:
   build:
@@ -8,9 +9,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Set environment variables
-      env:
-        CI_NAME: "GitHub CI"
     - uses: actions/checkout@v2
     - name: Set up JDK 11
       uses: actions/setup-java@v1
@@ -18,5 +16,7 @@ jobs:
         java-version: 11
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+      env:
+        CI_NAME: "GitHub CI"
     - name: Test with Gradle
       run: ./gradlew check

From 9552dd13734c3b9a81dd8f6d855657666e47256d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 26 Jul 2020 16:34:12 -0700
Subject: [PATCH 075/262] Added env secrets.

---
 .github/workflows/gradle.yml | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 37ec6ed..38cd0c4 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -1,22 +1,30 @@
 name: Java CI with Gradle
 
 on: [push, pull_request, workflow_dispatch]
-    
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-      env:
-        CI_NAME: "GitHub CI"
-    - name: Test with Gradle
-      run: ./gradlew check
+      - uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+        env:
+          CI_NAME: "GitHub CI"
+          ALPHAVANTAGE_API_KEY: ${{ secrets.ALPHAVANTAGE_API_KEY }}
+          GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
+          GOOGLE_CSE_CX: ${{ secrets.GOOGLE_CSE_CX }}
+          OWM_API_KEY: ${{ secrets.OWM_API_KEY }}
+          PINBOARD_API_TOKEN: ${{ secrets.PINBOARD_API_TOKEN }}
+          TWITTER_CONSUMERKEY: ${{ secrets.TWITTER_CONSUMERKEY }}
+          TWITTER_CONSUMERSECRET: ${{ secrets.TWITTER_CONSUMERSECRET }}
+          TWITTER_HANDLE: ${{ secrets.TWITTER_HANDLE }}
+          TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }}
+          TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }}
+      - name: Test with Gradle
+        run: ./gradlew check

From 6d556afa4022622ea36a9101fc892c774c0c41c5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 26 Jul 2020 16:42:01 -0700
Subject: [PATCH 076/262] Moved env to test step.

---
 .github/workflows/gradle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 38cd0c4..2fff393 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -14,6 +14,8 @@ jobs:
           java-version: 11
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+      - name: Test with Gradle
+        run: ./gradlew check
         env:
           CI_NAME: "GitHub CI"
           ALPHAVANTAGE_API_KEY: ${{ secrets.ALPHAVANTAGE_API_KEY }}
@@ -26,5 +28,3 @@ jobs:
           TWITTER_HANDLE: ${{ secrets.TWITTER_HANDLE }}
           TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }}
           TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }}
-      - name: Test with Gradle
-        run: ./gradlew check

From 94871a4df8e3848e17f1d5080664bd0e4eceb32d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 26 Jul 2020 17:28:48 -0700
Subject: [PATCH 077/262] Fixed CI_NAME env.

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 991c643..83aefb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 
 env:
   global:
-    - CI_NAME: "Travis CI"
+    - CI_NAME="Travis CI"
 
 install:
   - git fetch --unshallow --tags
@@ -21,6 +21,6 @@ before_install:
 
 after_success:
   - |
-      if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == openjdk11 ]; then
-        ./gradlew sonarqube
-      fi
+    if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == openjdk11 ]; then
+      ./gradlew sonarqube
+    fi

From 70d99a028dc9523bc58e73419a4e98dde9930492 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 Aug 2020 15:06:56 -0700
Subject: [PATCH 078/262] Added try-with-resources.

---
 .../net/thauvin/erik/mobibot/FeedReader.java  | 22 ++++++++++---------
 .../commands/tell/TellMessagesMgr.java        | 11 +++++-----
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
index 8c58b09..41795f3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
@@ -81,17 +81,19 @@ public class FeedReader implements Runnable {
     public final void run() {
         try {
             final SyndFeedInput input = new SyndFeedInput();
-            final SyndFeed feed = input.build(new XmlReader(new URL(url)));
+            try (final XmlReader reader = new XmlReader(new URL(url))) {
+                final SyndFeed feed = input.build(reader);
 
-            final List<SyndEntry> items = feed.getEntries();
-            if (items.isEmpty()) {
-                bot.send(sender, "There is currently nothing to view.", false);
-            } else {
-                SyndEntry item;
-                for (int i = 0; (i < items.size()) && (i < MAX_ITEMS); i++) {
-                    item = items.get(i);
-                    bot.send(sender, item.getTitle(), false);
-                    bot.send(sender, Utils.helpIndent(Utils.green(item.getLink()), false), false);
+                final List<SyndEntry> items = feed.getEntries();
+                if (items.isEmpty()) {
+                    bot.send(sender, "There is currently nothing to view.", false);
+                } else {
+                    SyndEntry item;
+                    for (int i = 0; (i < items.size()) && (i < MAX_ITEMS); i++) {
+                        item = items.get(i);
+                        bot.send(sender, item.getTitle(), false);
+                        bot.send(sender, Utils.helpIndent(Utils.green(item.getLink()), false), false);
+                    }
                 }
             }
         } catch (MalformedURLException e) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
index b712438..a921c7c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
@@ -90,7 +90,7 @@ final class TellMessagesMgr {
     public static List<TellMessage> load(final String file, final Logger logger) {
         try {
             try (final ObjectInput input = new ObjectInputStream(
-                new BufferedInputStream(Files.newInputStream(Paths.get(file))))) {
+                    new BufferedInputStream(Files.newInputStream(Paths.get(file))))) {
                 logger.debug("Loading the messages.");
 
                 return ((List<TellMessage>) input.readObject());
@@ -113,10 +113,11 @@ final class TellMessagesMgr {
      */
     public static void save(final String file, final List<TellMessage> messages, final Logger logger) {
         try {
-            try (final ObjectOutput output = new ObjectOutputStream(
-                new BufferedOutputStream(Files.newOutputStream(Paths.get(file))))) {
-                logger.debug("Saving the messages.");
-                output.writeObject(messages);
+            try (final BufferedOutputStream bos = new BufferedOutputStream(Files.newOutputStream(Paths.get(file)))) {
+                try (final ObjectOutput output = new ObjectOutputStream(bos)) {
+                    logger.debug("Saving the messages.");
+                    output.writeObject(messages);
+                }
             }
         } catch (IOException e) {
             logger.error("Unable to save messages queue.", e);

From 8cd309e3a389931547a0e5ab0104f58c2aa4545f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 Aug 2020 15:15:41 -0700
Subject: [PATCH 079/262] Updated dependencies.

---
 .idea/mobibot.iml              |  2 +-
 .idea/modules/mobibot.main.iml |  2 +-
 .idea/modules/mobibot.test.iml |  2 +-
 build.gradle                   | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index ace356b..910a915 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+071" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+090" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index ec0fc30..02b91f8 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+071" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+090" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 46615ee..f7f2246 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+071" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+090" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
diff --git a/build.gradle b/build.gradle
index 9a91c0c..9aa0214 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,9 +2,9 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.29.0'
-    id 'com.github.spotbugs' version '4.4.4'
+    id 'com.github.spotbugs' version '4.5.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.10.0'
+    id 'io.gitlab.arturbosch.detekt' version '1.11.0-RC1'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
@@ -23,7 +23,7 @@ mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
     log4j   : '2.13.3',
-    spotbugs: '4.0.6'
+    spotbugs: '4.1.1'
 ]
 
 repositories {
@@ -65,9 +65,9 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
 
-    testImplementation 'org.testng:testng:7.2.0'
+    testImplementation 'org.testng:testng:7.3.0'
     testImplementation 'org.assertj:assertj-core:3.16.1'
-    testImplementation 'org.mockito:mockito-core:3.4.4'
+    testImplementation 'org.mockito:mockito-core:3.4.6'
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
     spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'

From d7bfd70fa9b1b25645326db251f6444a85af1103 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 9 Aug 2020 21:07:05 -0700
Subject: [PATCH 080/262] Upgraded to Kotlin 1.4.0-rc

---
 build.gradle | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9aa0214..270e19b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,11 +4,11 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.29.0'
     id 'com.github.spotbugs' version '4.5.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.11.0-RC1'
+    id 'io.gitlab.arturbosch.detekt' version '1.11.0-RC2'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.0-rc'
     id 'org.sonarqube' version '3.0'
     id 'pmd'
 }
@@ -47,7 +47,7 @@ dependencies {
     //implementation 'org.apache.commons:commons-text:1.8'
     implementation 'commons-cli:commons-cli:1.4'
 
-    implementation 'commons-net:commons-net:3.6'
+    implementation 'commons-net:commons-net:3.7'
     //implementation 'com.squareup.okhttp3:okhttp:4.7.2'
 
     implementation 'com.rometools:rome:1.15.0'
@@ -61,13 +61,10 @@ dependencies {
 
     implementation 'net.aksingh:owm-japis:2.5.3.0'
 
-    implementation platform('org.jetbrains.kotlin:kotlin-bom')
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8-1.4.0-rc-218'
 
     testImplementation 'org.testng:testng:7.3.0'
     testImplementation 'org.assertj:assertj-core:3.16.1'
-    testImplementation 'org.mockito:mockito-core:3.4.6'
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
     spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'

From 44de253040d1086a606bc75562ce7f546df15e50 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 17 Aug 2020 14:30:24 -0700
Subject: [PATCH 081/262] Upgraded to Kotlin 1.4.0.

---
 .idea/mobibot.iml                             |   2 +-
 .idea/modules/mobibot.main.iml                |  48 +++++++--------
 .idea/modules/mobibot.test.iml                |  56 +++++++++---------
 build.gradle                                  |  53 +++++++++--------
 .../detekt/baseline.xml                       |   0
 gradle/wrapper/gradle-wrapper.jar             | Bin 58910 -> 59203 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |   2 +-
 gradlew.bat                                   |  21 +------
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |   6 +-
 version.properties                            |   6 +-
 11 files changed, 91 insertions(+), 105 deletions(-)
 rename detekt-baseline.xml => config/detekt/baseline.xml (100%)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 910a915..5d44a1f 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+090" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+097" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 02b91f8..23cf1cb 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+090" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+097" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,24 +8,24 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.6/23f028bcf9842e9ea63d23eabe408e0fbe7432b4/spotbugs-annotations-4.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
+          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.30/459999be0d6ac844dd3d2ca85c2daf14deb5f7f0/kotlin-stdlib-jdk8-1.3.30.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.3.9/4be434f5e86c1998a273e7f19a7286440894f0b0/kotlinx-coroutines-core-jvm-1.3.9.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.30/bf0edcf669e446e0d903a0681190d1e3df969ac4/kotlin-stdlib-jdk7-1.3.30.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.1.1/f2c06572ee999f374c0849d696305d203bf9c3e/spotbugs-annotations-4.1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7/11481f2c9feeb0e9b1b828953f2d4ba2f9b2753c/commons-net-3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
           <option name="jvmTarget" value="11" />
-          <option name="languageVersion" value="1.3" />
-          <option name="apiVersion" value="1.3" />
+          <option name="languageVersion" value="1.4" />
+          <option name="apiVersion" value="1.4" />
           <option name="pluginOptions">
             <array />
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.72/657d8d34d91e1964b4439378c09933e840bfe8d5/kotlin-script-runtime-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.3.72/e09990437040879d692655d66f58a64318681ffe/kotlin-scripting-common-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.3.72/7dde2c909e6f1b80245c7ca100d32a8646b5666d/kotlin-scripting-jvm-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.2.1/3839faf625f4197acaeceeb6da000f011a2acb49/kotlinx-coroutines-core-1.2.1.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.0/52ac54a56c9121f54fcca387c5a0f441d1af9be8/kotlin-script-runtime-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.0/9c5c5503c8f96b477661789168b3f4a3c61a6c6e/kotlin-scripting-common-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.0/d807bf2ab36765af04b29319989322efd5ad1401/kotlin-scripting-jvm-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar" />
               <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
             </array>
           </option>
@@ -48,37 +48,37 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.1.1" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
+    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.30" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.3.9" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.30" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index f7f2246..28d189b 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+090" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+097" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
+      <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
         <compilerSettings>
           <option name="additionalArguments" value="-Xallow-no-source-files" />
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.6/b71de00508dcb078d2b24b5fa7e538636de9b3da/commons-net-3.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.72/916d54b9eb6442b615e6f1488978f551c0674720/kotlin-stdlib-jdk8-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.72/3adfc2f4ea4243e01204be8081fe63bde6b12815/kotlin-stdlib-jdk7-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.0.6/23f028bcf9842e9ea63d23eabe408e0fbe7432b4/spotbugs-annotations-4.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.2.0/23ba3a808f4977cebe17e53e784407f672d367fe/testng-7.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.mockito/mockito-core/3.4.4/6213e9c1b25a845167e27a51e6b6886b4306a920/mockito-core-3.4.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.72/6375e521c1e11d6563d4f25a07ce124ccf8cd171/jcommander-1.72.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy/1.10.13/1426b15be5954246a9a72fd4baae1f42b9a4f45d/byte-buddy-1.10.13.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.bytebuddy/byte-buddy-agent/1.10.13/f5b939963d13be46c101a3c12bf49aa23abb191/byte-buddy-agent-1.10.13.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.objenesis/objenesis/2.6/639033469776fd37c08358c6b92a4761feb2af4b/objenesis-2.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.30/459999be0d6ac844dd3d2ca85c2daf14deb5f7f0/kotlin-stdlib-jdk8-1.3.30.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.3.9/4be434f5e86c1998a273e7f19a7286440894f0b0/kotlinx-coroutines-core-jvm-1.3.9.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.30/bf0edcf669e446e0d903a0681190d1e3df969ac4/kotlin-stdlib-jdk7-1.3.30.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7/11481f2c9feeb0e9b1b828953f2d4ba2f9b2753c/commons-net-3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.1.1/f2c06572ee999f374c0849d696305d203bf9c3e/spotbugs-annotations-4.1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
+          <option name="jvmTarget" value="11" />
           <option name="friendPaths">
             <array>
               <option value="$MODULE_DIR$/../../build/classes/java/main" />
               <option value="$MODULE_DIR$/../../build/classes/kotlin/main" />
+              <option value="$MODULE_DIR$/../../build/libs/mobibot.jar" />
             </array>
           </option>
-          <option name="languageVersion" value="1.3" />
-          <option name="apiVersion" value="1.3" />
+          <option name="languageVersion" value="1.4" />
+          <option name="apiVersion" value="1.4" />
           <option name="pluginOptions">
             <array />
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.3.72/657d8d34d91e1964b4439378c09933e840bfe8d5/kotlin-script-runtime-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.3.72/e09990437040879d692655d66f58a64318681ffe/kotlin-scripting-common-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.3.72/7dde2c909e6f1b80245c7ca100d32a8646b5666d/kotlin-scripting-jvm-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.72/6ca8bee3d88957eaaaef077c41c908c9940492d8/kotlin-stdlib-common-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.72/8032138f12c0180bc4e51fe139d4c52b46db6109/kotlin-stdlib-1.3.72.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.2.1/3839faf625f4197acaeceeb6da000f011a2acb49/kotlinx-coroutines-core-1.2.1.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.0/52ac54a56c9121f54fcca387c5a0f441d1af9be8/kotlin-script-runtime-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.0/9c5c5503c8f96b477661789168b3f4a3c61a6c6e/kotlin-scripting-common-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.0/d807bf2ab36765af04b29319989322efd5ad1401/kotlin-scripting-jvm-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar" />
               <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
             </array>
           </option>
@@ -52,47 +54,43 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="mobibot.main" />
+    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
+    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.6" level="project" />
-    <orderEntry type="library" name="Gradle: org.testng:testng:7.2.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.testng:testng:7.3.0" level="project" />
     <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.16.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.mockito:mockito-core:3.4.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.30" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.3.9" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: com.google.inject:guice:no_aop:4.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.72" level="project" />
+    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.78" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.10.3" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.21" level="project" />
-    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy:1.10.13" level="project" />
-    <orderEntry type="library" name="Gradle: net.bytebuddy:byte-buddy-agent:1.10.13" level="project" />
-    <orderEntry type="library" name="Gradle: org.objenesis:objenesis:2.6" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.30" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:guava:25.1-android" level="project" />
     <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
diff --git a/build.gradle b/build.gradle
index 270e19b..302e536 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,11 +4,11 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.29.0'
     id 'com.github.spotbugs' version '4.5.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.11.0-RC2'
+    id 'io.gitlab.arturbosch.detekt' version '1.11.0'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.4.0-rc'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.0'
     id 'org.sonarqube' version '3.0'
     id 'pmd'
 }
@@ -36,6 +36,8 @@ dependencies {
     annotationProcessor semverProcessor
     compileOnly semverProcessor
 
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+
     implementation 'pircbot:pircbot:1.5.0'
     compileOnly 'pircbot:pircbot:1.5.0:sources'
 
@@ -44,11 +46,9 @@ dependencies {
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
 
     implementation 'org.apache.commons:commons-lang3:3.11'
-    //implementation 'org.apache.commons:commons-text:1.8'
     implementation 'commons-cli:commons-cli:1.4'
 
     implementation 'commons-net:commons-net:3.7'
-    //implementation 'com.squareup.okhttp3:okhttp:4.7.2'
 
     implementation 'com.rometools:rome:1.15.0'
 
@@ -61,7 +61,7 @@ dependencies {
 
     implementation 'net.aksingh:owm-japis:2.5.3.0'
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8-1.4.0-rc-218'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
 
     testImplementation 'org.testng:testng:7.3.0'
     testImplementation 'org.assertj:assertj-core:3.16.1'
@@ -84,7 +84,18 @@ java {
     targetCompatibility = JavaVersion.VERSION_11
 }
 
-compileKotlin {
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+    options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
+    options.compilerArgs += ["-Asemver.project.dir=$projectDir"]
+}
+
+compileJava {
+    dependsOn('incrementBuildMeta')
+    options.compilerArgs += ['-Xlint:unchecked', '-Xlint:deprecation']
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
         jvmTarget = '11'
     }
@@ -92,14 +103,17 @@ compileKotlin {
 
 spotbugs {
     toolVersion.set("$versions.spotbugs")
-}
-
-tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
-    reports {
-        xml.enabled = true
-        html.enabled = true
-    }
     excludeFilter.set(file("$projectDir/config/spotbugs/excludeFilter.xml"))
+    tasks.spotbugsMain {
+        reports.create("html") {
+            enabled = true
+        }
+    }
+    tasks.spotbugsTest {
+        reports.create("html") {
+            enabled = true
+        }
+    }
 }
 
 pmd {
@@ -111,18 +125,7 @@ pmd {
 }
 
 detekt {
-    baseline = file("detekt-baseline.xml")
-}
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-    options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
-    options.compilerArgs += ["-Asemver.project.dir=$projectDir"]
-}
-
-compileJava {
-    dependsOn('incrementBuildMeta')
-    options.compilerArgs += ['-Xlint:unchecked', '-Xlint:deprecation']
+    baseline = file("${projectDir}/config/detekt/baseline.xml")
 }
 
 javadoc {
diff --git a/detekt-baseline.xml b/config/detekt/baseline.xml
similarity index 100%
rename from detekt-baseline.xml
rename to config/detekt/baseline.xml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c053550b91381bbd28b1afc82d634bf73a8a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644
GIT binary patch
delta 6656
zcmY+Ibx_pN*Z*PZ4(U#j1qtbvrOTyO8fghZ8kYJfEe%U|$dV!@ASKczEZq$fg48M@
z;LnHO_j#Uq?%bL4dY^md%$$4Y+&@nKC|1uHR&59YNhubGh72|a#ylPdh9V+akp|I;
zPk^W-a00GrFMkz_NSADdv2G2-i6rb=cB_@WnG(**4ZO$=96R=t|NZ@|0_z&q3GwO^
ziUFcuj$a9QaZ3j?xt`5#q`sT-ufrtBP0nt3IA&dr*+VCsBzBVW?vZ6eZr0oD%t33z
zm~-5IVsjy(F>;S~Pm@bxX85>Z*@(QL6i3JQc?1ryQFcC@X<g1opq2_}qf2n}bDuZ!
zWKPTwxVBuNP19Vh!S06D1kwi8IR?%Q_tS6CMlcH1GHnzzTF6L#bC>^2^mZWhFv|v?
z49>l|nA&XNQ6#OvccUTyBMB*WO#NA;FW5|eE_K6dtVYP2G?uUZ09!`Iq1IF2gA(aS
zLu@G^cQJmh=x?-YsYa@E6QnE5+1@ds&0f#OQRDl^GnIT_m84G5<dL|9;ap-%@DK)Z
zJXsEXvC4R9p`vBWj#UC!X4t9*FN2~aT(@1kpVpb4hs(&XgSwrc&@$a1G{BRj>XY%W
z;Ck6bk^Oeu*Ma-XmxI5GjqzWNbJMsQF4)WfMZEA{oxW0E32e)*JfG}3otPishIQBw
zkBe6N#4pKPN>q1<c_S*OgJu!sX3Z+i&!nPIcOY>R6G1@5&(u#5yPEToMBB6_oEK|q
z@(i5j!?;NNCv~=HvW%zF&1yWBq(nJa_#``G&SRmQvE|jePUPs{J!$TacM|e}Fsceb
zx+76|mDp6@w>)^DIl{8?)6XYNRU|2plG8Jy&7(^9SdOWNKKJK&>0!z6XiN4J*Jkao
z=E1y5x-XDC==Ub+8fLb#OW&{2ww{h^xlJFYAMOUd)}Xg@j?ak{7Kno6?9S~F?|6Df
zHo|ijXX~`Sp;Vf!nR;m%vUhq>zvlRXsL0u*Tt?F#yR}3tF0#of{(UjitqST|!{aBA
zicWh+URU}Jnc*sg9iMkf0pggpd?3TI*C-q<w(&M(m~}<+ea%u!x4kn@vQlH&LiI*R
zB7X4OuQk^>$2QOdCC7rV+CHBmjS3O%a3VeZ$ZSs5ubJuJp%e%$LHgrj0niYjX;4kt
z&2~j%@q3MO)-QGCA{>o%eZu){ou^MgC6~Z8Y=tc!qF=|TOlG3wJXbaLYr-;$Ch=2J
z_UcE59Xzq&h0LsjLrcZrQSa}#=<pCCwP+K`qAyWcDPE8l5gLuQQOCvX;roV=GVrSE
zRN);#vB=RiA;a;S-a3{ts<IR~#XeBK(^k2SU^wSX*pR6ItHBeZh6`9>0~Lk|4?e4M
z6d;v->NCC1oMti)RRc`Ys0?JXQjsZ@VdCy%Z)TptCrI>0Tte$pR!@yJesoU2dtyuW
z7iFsE8)CkbiJP+OP28;(%?!9WddQZcAid@R@`*e%3W65$g9ee`zvwb(VPO+uVBq6p
z{QDR%CR(2z@?&9Obm3xPi2lzvfip`7q`_7UDD|lRS}4=bsl3xQIOi0@GSvMuDQX}*
z4B^(DI<${qUhcLqO`itJU;e<%%iS+R3I^_xIV1O%sp*x~;-dn`<aYhWZu1&;ElKY}
zZm_NJ1y%e}JjMBfENCOnH*9mb%EUJ6T{;w?3xbxNE?0r$=$2S(JXNNaff+pj)0X3>
zt$8>RnSUh#rU3{-47067W^WNwTdq-t$-U>Hj%<yt<n{U-FV<(AG&gDIp@t66wM-#N
zJ0?<X`&{ENL@S2=a5R+rxyBKhousp3mE<6*BMfnp%7NjFkWa)L3fT`1HBv5%ZfmOw
zhfZB1(`R?=E{3p6h;?}T;`D(_q#Ku3P-Ts<H#|7m=*&#2oY&#Ro7~>r!GD!gLa;kV
zW5g6pCqV+!q8L<UGl1?nMLH9G$%I9J5pf%SH`n0VUkU3HRVup}<-k>g<GGq)5g+Yh
z(D%0Fi%@DB?*x0Zd<NwfgyV{8`bVpQShO;~J|KWnPzdo^lb#dD?*K6EooR1<VJ_v<
zIDNbrd-Z5*%cthuAR2mSEPE16Kl1(GUID!8pTq5|-JJ!w8cUSAz)I_XJ9(9qPII5A
z{m8ntai8GtO_h-1);fteB7SYUuxchvIWXzRs-%D3CKzg49@qap!-y_GAiFu7J2<V+
zI9$85dJyuc!h2k|X8>rI49(}fIc5K_`FLV4_E#XZ6{<>w8wzc%V9k!!Byg5-0W<bB
zR4jcLpMe)Gr+Qyft>Y+J?1*z%9~Aj4WQr1Jsn2(G!U8fFpi(wsy@JLg^d+IB0kl89
z0@Ssqf!L9JjYKK$J=978+NO*5^C)GPH2a%4hm$HROjM|N3g9ch9kDLh*nlwqy{mVM
z`P(l#>3NnK%#O8tSb(VmZrG+`dRD#=Cc1P%(y5<uj@qeNQCeA+H|Gn!g_|!%1V&w&
zuh#8(%DbZdv0kum$}C@EvW671;^A-6ZeF^cq90@k<+emVi}AFjw0JMveLbO*9WV0O
z&|{@C`c`onN9UkF9-_#}<r?8uJJmMfj{j(TBRk{Sx^)QATI}<bZ@pbg#5I&#ETmpi
zdutUe8}E>S?*Hj5E{vg&Eiw!YV>S#7_WRDVoFxT5m=gFi4)}y5V%KT8!xbsH_rmR&
zsmM?%J}K$1l8d?2+m(}2c}-G`x>CY%Y&QBJRC$sKM}zN<9{IlF@yJEG<^0={$+`Hc
zDodJ)gCADJ_bD#am(c2ojXKb|j+ENJ#58PAA&pZXufrFzBwnuuo+khfMgd!DMlU#v
z9|JelQO~E2;d^w!RZJbt%IANIudpKSP)cssoWhq)>({nvcfCr0=9=FAIMuZm8Eo=}
z|DND}8_PB5HqG(QwDvaM@orYBZ9kCkHV*<E7fD~^kv%Rt4%{0-C)!*WD4&mmZ)2k@
z-vh9{wcc~riJLaZRf=zb|DG1QfaO{cxPCox1C=uT`?QobU{6i7M5tnvWwDprp6hO!
z9Olm3CW}@PFjzRUj)1AJdn)o8&6l`GL^Vw`8_u3=Yfczem_N=JgXn+gw#@t%tK48L
zs-<kelU-VD@{pmRdxYAu=uDIBXxH>rxKTy>q7n~0emErUwLbhq;VN<2nKT&*a2Ajz
z;lKBzU2i8KLV`d)Y&ae)!HcGk$dO}Or%8KF@kE@jU1h@zwpw{6p4ME|uC$Za-ERR2
ztQvL&uOZLe(k{w_+J^ng+l}~N8MP>F1Z$fLu}D-WWaeu#XduP@#8JpmH(X>rIL)k3
zyXN<rev&d&<2WhaHMotlzr4K)q{=z;9yuB}>yTIB1(IH%S&pQ{rWaTVfB$~-;RnlY
z^(y7mR>@=brI>!TrA)BQsQ={b*6$=1Eqbuu6IdhJ&$YD$08AwtNr9*J?%-WT<;O1<
zPl1<@yeqfZ>@s4azqTf<=I4(kU^+^Qkstm%WM-0_VLm({jFc8`5Df2Q1Y9zMZu0^!
zsO_yh2Sz9K>Jq6fkYbBZocEJ6C!SdEzYDki<UOQeTxqpjlE|pdf{rBSqZixK7JCQ3
za};>EtNJs{?!tA#e|oiN+VaaAobwKef_kUup&4scD?1+}Q8)DaekkMYn-FOS{J%NY
za^mmJ^n`t*1p@hF*gl#L+5wr40*(ub4J#L|@oCl~@|4UvCjHBYDQ<!vXtmSW&BzM&
zXCI8YO-Gl|ywfX4W|TNg|9V$g!tLC2nAlHTp*X=wVa=dll|;=;C!FFd`g5-mY#xif
zCrc|%X+s(7QZF6mu~fSmKun~s(X%MyENK#tU+^qGE_(Wr)GBG;=``T~g*~piR>v&S
zhyGMAkRO^tF_dyi&XM)4mQ;k>kj?Rg<j^$zwJ$9puUmM8UTsnl8o98aL@#eUk2T@Z
zqrD)t_0=dw*ucUqtb<o3xt;=7iFLqRgUUI5+ac`qMuWQ|kuL1{tAxL;i&U#0PcS3M
zz)XghN!?Liqk700FA&h+RC8`bO%6eLm?;=pd1*#hD4`dB*@?<Zh=@~@+ywEwqdE!q
zvgJyQHWiY$0fC@DG;IIOj`<tUPDWmHNSP9Ub5<phX&5{ZKNNnzZka#ulAcr8(Pe1#
z?F$huuXLj!;t!DOL%CownzwD5sHR`0d9Bp3gf-l7^DCB=I2quKZskc8$|SoP!V#2_
z`*g51(;1U&!%(|9{%bDJEKTC`ji%DwO-jZY?C@uqG`?Gp$$3WJI(Y=^5wIvSKG~%3
z@HVu=CGDCWd$!}~CX)4b(^Di1y6h66Cz_v>Ro@-?==oD+ns*>bf@&fPXF|4U0&ib2
zo~1ZdmCPWf!W9#sGP@9X$;Rc`tjbz^&JY}z{}j9bl?;VC{x)TfQH$D^WowKL&4Zx@
zdSn+QV7H(e0xRfN6aBfH)Q=@weoD?dvu6^ZS)zqb>GwMmIuS8zJfaMUQx9>%k~w34
z3}_B2Jj~u=SnJ~vZPj*)UoDi_FtT=UAb#J^b4B%R6z3H%cj-1OCjU5F$ky>By1zsg
z>2A0ccp29(Y<;my|J_g-r{1I@+*O$>!R3`_sFNP4e}LD1e1mM&SA`;;TR0I`_hESV
zh4U*9ecK$0=lYk`{SR_cm$}iS*?yQR(}T-5ub?Wn^#RTe*^1~y<L@mmwlq4SqQ^?7
zf7HAsMJ5k`W|1diAqpM5uUc8t@?WSh02mK$-Z;uXYCkL7ljF*c65*4_UK4l|`X<eU
z^N$DksrBl1@$Dq}7uV|tt!bh+5FU%NxvXKkJEx$0R%>a%`!xWq-F*WH@%nnZTNREA
z3eUX2uM9b_w!Zo$nVTotEtzuL(88N)H~v_G=89|(@IFz~Wq6ME);z(!2^PkR2B&kE
zxR)xV8PE|Hszyjp#jNf=ZIQ7JR~4Ls#Vd@mPF(7R5VO$akUq8JM+sn>ZVg<OsE?Y=
zt3-TLl#CZV8ORMEf6*q;Tnxr)!*Y1IoRA-M0=p!LFW64(0m88U<oG$?P$^h+WmvS9
z<8z1rS2(}S*O&eI-K7~4v48J3xj`QiGpU_a%TBpGAh&v{?J_XalWixRT<}`uCL0Y^
zKB~jnq|v$FLLNbplmri)IYLkmF%#~TlvYmKBn(<H%e+PW4UN<fy-v)zu0$9B2*z9N
zy)F~H8nKt#UG6>(lJZ)5qjqdw(*7tuwjY#0tx+|!sTz9yV~%HOdrb#!5w9>*0LrCS
z%wF$Yc6~hqVQZzoC^D<(-h0aOtk}kn<<*x<A9mKbP59xJ&kBtE?yc}h?x49=29=z5
z7U|zFE0ulr4;2`B6lrT?x-kUP7ZGRtFHk!A!-sdf?I?Ik<PlR?wDIbv!Z*<2aw=!Q
zhp0EM%B4Q)?vQ#>F61HQr<5}efY{zXXA+PaJG7vT&{Oz(@Uu!V#Fp9%Ht!~@;6AcD
z$lvlPu&yd(YnAHfpN51*<LyqPo5!UzBh2tI#n2^qu<jx|_m5<z4nj-b!Mswq8*jU5
zY#>)JN0aYw9gGk{NE7!O<M2UZbF4L>qu4rBp}F30669;{zcH-a7w9KSpDQPIE_f9T
zit<e72SXx52%a0m4sGH(B<|=w6Y(ybW4-qB1uqEWI&~veyng0KkrFJ}KX^W^s?U3(
zs2i~8*TWIIbmEyPwvm}db!=_(gmmKD@xJOY(~YawWggKL<fbxDMw@}=8IlRmRv$>?
zJSjTKWbe{f{9BmSDAFO1(K0oqB4578tU<q-Ne=5=n^YUvA(1)FPw|uIz68u3R{NH`
zK^uEMleb&(=C`d@mZz8w`l4ZDh7>0(oRBE^28X>xDA!1C&VJEiYak4_ZTM*7M`hv_
zw3;2ndv3X$zT!wa7TrId{gNE`Vxf}j5wsyX+;Kn<^$EJT`NzznjyYx=pYMkZjizEU
zb;Gg8Pl_pqxg)9P)C)Hxh_-mQ;u-I_Ol>d^>q08zFF!>Z3j1-HmuME_TGZ*Ev;O0O
z%e(edJfV<6t3&FKwtInnj9EeQhq9;o5oLJoiKwWF5bP2~Feh#P4oN()JT0pdq!9x*
ze3D-1%AV#{G=Op$6q?*Z>s{qFn}cl@9#m@DK_Bs@fdwSN`Qe18_WnveRB583mdMG-
z?<3pJC!YljOnO8=M=|Cg)jw;4>4sna`uI>Kh&F20jNOk9HX&}Ry|mHJ+?emHnbYLJ
zwfkx@slh31+3nq-9G5FVDQBHWWY}&hJ-fpDf!lQdmw8dlTt#=)20X74S>c&kR(?PT
zBg)Y%)q&|hW1K;`nJPAGF*c3{3`FvrhD9=Ld{3M*K&5$jRhXNsq$0CLXINax1AmXX
ziF39vkNtcK6i^+G^AEY!WalGazOQ$_#tx?BQ{YY$&V&42sICVl8@AI6yv;sGnT;@f
zL=}rZcJqNwrEEA=GDdEe8Z=f9>^?($oS8xGdFf1eUWTYtZF<3tu2V%noPBnd=thZ+
zO&xoc?jvXG7Xt!RTw#5VN50UjgqSntw9Y35*~pxz=8OzkXg{@S2J%+{l3Q>B_qbnl
z20Deb7JM&ZSp`%X>xWpb>FF8q7Nq&4#a1}A-(-!aMDmVbz05D!NpUzVe{~72h%cOh
zwQFNai2a$K<lb>|hFgDk(oPF_tuf{BV!=m0*xqSzGAJ(~XUh8rk#{YOg0ReK>4eJl
z;-~u5v$}DM)#vER>F)-}y(X6rGkp<{AkiPM7rFgAV^)FUX8XmCKKaWlS4;MSEagj$
z#pvH`vLX1q{&eOm>htnk4hmv=_)ao!MCp}9ql5yfre&Py!~hBAGNBa}PH&J8K=~<%
z&?!J-QaH|0bq_uo6rt*r-M>d7jm1cbW^T>s)S?L{<LgYs4$0}?XO8K~#{O6m2!CM0
z#Fo>n8v`^?VIPA+qi^6e@cM|5boqEO!p1e|_{7U3Yl6K?0xMN1bbjf0@$TE-T))w>
zFe?E?g$PUT-)AJ(PS^By^D^Ed!K5iv$*_eW<?$gk^ph*&Zkhdaw3i_v<GhJk|I!}L
zHQc`<CTEX!k2X24SiMt&T15AG1<E<Xmk*5-0d$t5VhMvaiUj$*^^Hdbo{kaE2oCn8
z{P^BVPxp~(2kY{iRU!^zTe}Wo#z|<Ai`g_yW$S+T2Im{GIGmFiK2shuu14CmOr}6Y
z=bVpR=^=4i>~VA(I3~UMy*ZcgVu0$XZC*_0PgDmUL)qTCn927LD~p$yXR_GCJ&iQ;
z4*`%l-dC5pALH!y*nmhdHRh02QjW1vZL4ySucz*w3f|#`=u@@YvMV1?i!&DIa2+S<
z8z!gvN3FV4I;%fl;ruFeV{jKjI~?GlgkmG<!$YWAS;7KYqqu1ud246Lh<veb9iZ`Y
zQshertU5W-2yEW32YKEq9B9NDHt!WC3}CB|^}1WeMrQ0g_ZKjQ=}R~Wbh!pQNl&h9
zA3+TUWpuB>BuJ<7vY|l3xMOc?S@Q#C(zo*m&JLrjT2rU9PYOniB8O~yO5<1CCcQz#
z17B2m1Z{R!Y)UO#CU-Y&mOlv4*Gz%rC_YkRcO)jTUEWHDvv!GWmEihE>OKPx1J?Av
z8J{-#7NsT>>R#*7**=QL)1@IR77G9JGZZiVt!=jD+i(oRV;I`JkiTSZkAXuHm-VG1
z+2-LD!!2dNEk@1@Rp|C$MD9mH^)H*G*wI(i*Rc6Vvdik+BDycYQ*=0JA3dxxha|Zg
zCIW1Ye-DdpMGTEwbA^6hVC<(@0FL4dkDOYcxxC5c%MJQ^)zpA%>>~Q|Y=@)XW!px;
z_Fx+xOo7>sz4QX|Ef~igE+uFnzFWP<-#||*V0`0p7E*+n5+awuOWmvR{-M*chIXgo
zYiZvQMond#{F8+4Zh_;>MsaZUuhp=onH@P!7W>sq|CWv|u}Wg0vo&f4UtmLzhCwwu
zJaR=IO;sQxS}h(K>9VZjnED+>9rGgB3ks+AwTy_EYH{oc)mo`451n&YH%A1@WC{;1
z<S^oOzaAWP#P5AQ+yVE{zDZxsAshHBu`Sn^2)=$8V4u{G7s4nfAql8C-&rsbhL619
zT{pccX^Z(hBgxhK7sr@H2<zfTupxqNt`Ymc=JN=v85hF;oxmYxW{jEs&)DGKi0;4F
z`?t{)h-7k3gy1|mB50NYRLPDgViQ4(%z{DL9EfCgF$Dh{7*xdjFNhl9I;RY>=fB6n
zIYp46_&u`COM&Di?$P}pPAlAF*Ss<)2Xc?=@_2|EMO?(A1u!Vc=-%bDAP#zDiYQvJ
z0}+}3GaLxsMIlh6?f=iRs0K=RyvMOcWl*xqe-IBLv?K{S^hP)@K|$I+h_)pdD9r~!
zxhw<f^+7<FEkIEJe}*3M!jB8_V;Ky>2u66+F(E`&6hY}B_qe>wil|#*0R0B;<@E?L
zVrhXKfwRg0l8r>LuNs1QqW&39ME0sOXe8zycivGVqUOjEWpU)h|9fwp@d(8=M-WxY
zeazSz6x5e`k821fgylLIbdqx~Kdh^Oj`Q!4v<MeLmQVBVlpLY7!2m)R{l`s%7~UjD
zl>c*Km)^Tr-qRxPHozdvvU^#xNsKVr6aw8={70&S4y*5xeoF@Q^y596*09`XF56-N
z1=Rm5?-An178o?$ix}y7gizQ9gEmGHF5AW+92DYaOcwEHnjAr~!vI>CK%h`E_tO8L
Yte!%o?r4GTrVtxD61Ym!|5fq-1K$0e!T<mO

delta 6475
zcmY+IbySpHyT)Mv(V?XWQEKQKx&;a8?rvs8N*ZBC(4modXq0Xc5Re7|2?eA<x?>1w
z1SC8j)_dObefzK9b=~*c&wBRW>;B{VGKiBofK!FMN5oJBE0V;;!kWUz!jc1W?5KdY
zyZ3<RNhmOMPXQ%?Y{f(mV$PR(&ta>mCBHprpchz-9{ASiJJh&&h1|4rdw6wxD2+9=
z#6#}Uq8&^1F3wgvGFoNDo?bIeEQXpcuAR0-+<E0eD1<+n495hAFD-m!{c9R+acsl`
zr2;WG>w$JWoK-@yUal1M&~W_O)r+Rx;{@hWH5n^oQWR36GMYBDDZyPK4L@WV<AWd8
z3jJ~Dx0Sn}6r@wK_EVL?e7(uHgF33t=)?1OWJsL`Y@B|w8<p8lug3^Cfo4)a?ys2~
zp$BnBOcfgbvy{}O$2FZ<Yc<4(^kd6-NxixHbx#di;*DLf{AN`{XPIV|p8XxJ%~6T9
z169SiFQ}4vKl<OXaQ$?J5=Smvsba&>jRrF+XlSzi4X4!_!U%Uujl6LHQ#|l(sUU%{
zefYd8jnVYP91K}Qn-OmmSLYFK1h~_}RPS~>+Xdz%dpvpJ{ll!IKX=JN99qowqslbO
zV3DmqPZ}6>KB!9>jEObpi$u5oGPfO3O5!o3N2Mn`ozpje<}1I1H)m2rJDcB7AwXc6
z6j)tnPiql7#)r+b+p9?MVahp&=qJ^$oG+a^C*);FoJ!+V*^W+|2Olx5{*&$bXth)U
zejc7mU6cBp?^Rj|dd{GL-0eHRTBi6_yJ&GLP5kIncv^z{?=0AVy^5{S8_n=rtua!J
zFGY=A(yV^ZhB}1J_y(F`3QTu+zkHlw;1GiFeP&pw0N1k%NShHlO(4W+(!wy5phcg4
zA-|}(lE_1@@e6y`veg;v7m;q%(PFG&K3#}eRhJioXUU0jg_8{kn$;KVwf;zpL2X_(
zC*_R#5*PaBaY73(x*oZ}oE#HPLJQRQ7brNK=v!lsu==lSG1(&q>F)`adBT~d*lMS|
z%!%7(p~<7kWNmpZ5-N31*e=8`kih|g5lVrI%2wnLF-2D+G4k6@F<j<_KKI2HUZ#JC
zEL?^UQ`790e!k%Sl`r$=7wv$)k+UD3#J7xkQm8|*_z_t&0&znDYdlFf<lSb9D@O@+
zZ!-`kEDk&T;jsyNIvu2?{5YHB@d_?dcUQM7ZCGTAXoZ7?vRUpVPB`DEb=&;WPjC34
zF+s`Jb*T<gJMUdgTFKxZ<#?~UldG&2rr!NcDw_QFOECs<wiAO?1xcTCUdWSFO{iDt
zii;4@b{2!gSVd*_;SD{Wj4bX4QwT~c`|aA0{<u{!?DGl@lKC>rYsJ_80AJ}KMRi>)
z-kIeHp{maorNWkF81v0FKgB==_6blyaF$5GaW)B!i4v*jNk6r)vU6?G$0pV8(Y+UK
z5lgRVt%;N_gWp)^osv=h+^07UY6+$4^#t=M3>0i0`{`aEkFLL#a)93uXhYO+aKTtu
zckg2T9S&GKNtZmdAS^8PzvDva-%-K&g9eqPXQ4$dM<HFq^W4I;ysVDth>^inr@6Zl
z{!Cq&C_+V;g*{>!0cZP}?ogDb$#ZS=n@NHE{>k@84lOkl&$Bt2NF)W%GClViJq14_
zQIfa^q+0aq){}CO8j%g%R9|;G0uJuND*HO$2i&U_uW_a5xJ33~(Vy?;%6_(2_Cuq1
zLhThN@xH7-BaNtkKTn^taQHrs$<<)euc6z(dhps>SM;^Wx=7;O&IfNVJq3wk4<1VS
z-`*7W4DR_i^W4=dRh>AXi~J$K>`UqP>CKVVH&+T(ODhRJZO7DScU$F7D)di-%^8?O
z6)Ux`zdrVOe1GN<G3RW<P}NclcZ;cr1<LFtG_;Z672#mvZgILXiTZvTpg(f1%=}tq
zw4t5+i@n~C;YWwxL5oy<J+Fl#54P_AVbyFP<o}isGa;mL7SC}s)k7Y-^2dTzes6p#
zt!v<GA#F7bwx;uCare`wDTh>kPo0FgrrxSu1AGQkJe@pqu}8LkBDm+V<Ga%|X~U@M
z(Y0q99Ga{NmNw0uagTIun{8R8q;oX}#>!N_1l}`tjLW8${rgDLv3m@E*#zappt-Mm
zSC<$o+6UO~w0C=(0$&*y**@nKe_Q{|eAuD!(0YL0_a{z%+sdfSyP={Nyd$re6Rzbp
zvsgTY7~VflX0^Vf7qqomYZ_$ryrFVV2$sFyzw2r%Q8*uYDA+)iQdfKms_5(>!s#!(
z!P5S(N0i9CKQKaqg(U%Gk#V3*?)lO6dLv`8KB~F<-%VhbtL8Rl>mEz+PN=qx&t*|=
zQHV=qG)YKlPk4iCyWIUGjC?kpeA>hIBK*A?B0)rB=RqAal#D%1C9yVQwBcz${#Jb5
zR{TRmMrOrJsLc&6x9qDo@FJ^=do_Y?3oU0G^nV5_EU&+DS+VA7Tp{^TAF>yZbyM3c
zf*1CqHY9T|aL_lyY7c)i!_MtGPA!sdy3|mrsKVj1mi&>dms@-ozSa}OZ?2I*tAndg
z@S7er$t^d^-;!wLQbG60nWd@1pQVD7tw-G_B#OscoYyremiZ_hj8*sXqQdchuD^!R
zpXGuSj5psk+jR>3rWu3^`17>j&*^9^rWbszP=Mf@5KIEj%b=z98v=Ymp%$FYt>%Ld
zm8})EDbNOJu9n)gwhz_RS``#Ag)fr)3<*?(!9O~mTQWeh;8c;0@o=iBLQNqx3d_<e
zt91v<?G?!LHz{R-87XfM!AWjL{sn#5a;-QI*9|NoYZIK6hoh(;ejoaFC@lGuPdVMR
z8|8A;z@h<-5g7)qWCEs?ZF<WwoNl@oyh);EEsE<OI(uB6T>2#W7S9#FXzr6VXfs>4
z;QXw}-STvK9_-7H=uqgal2{GkbjVLN+=D5ddd)4^WvX;(NYA*X*(JxTdiUzqVJopd
zQg#~psX4o<)cF>r=rxP`(Xsf<+HG-pf&7aFPL8z|-&B*<cG2l%Lne(g(X=5qY;sV4
z0>P?Vmsu5d>Nlg^2$WRY!S@#`g2{81;(1w#o5HsvN}5pFZi});>|VK^kL{Zkx~wgn
ztlZp;HW`H8(GdRfIwc~?#N6}o#h158ohI*GIsK%56I_9sf2k_K@4vD!l{(dX<T?g%
zrms1H&%vebw!Y=teDdj6F)p>9E7PJ;w>$|Y;-VBJSO4@){07bo-89^LZ9g<<%;dOl
zyIq{s8`8Ltp*GDwu(l_Z$6sA2nam$BM$Q~6TpZg)w2TtW?G5whV(lRwaf$6EU86is
zBP9Rs&vS_~sk?Nn_b}^HkM8LiO@>J}=g(T4hLmvH@5Jj#2aHa~K)lD9VB0k>$V2BP
zgh;(=y9Op(KQ=H5vj+%qs>?s4tYN~-Q|fyQePA)s?HrF~;l!+@t8VMzqUpqMLudFT
z)=o~s!MM4XkgbetIsODwtQ=FF$IcIp&!pjh6Q6{tL+l*7GQ%8Wsg(tC#qU3oW$~n)
zL=>XIxI}Hi7HS0F_mmi+(c%1HDuKiWm>|6Xa}nW7ei55ggru9)xjBvC#JcEIN*#cp
zv*ACvr=HTC?dX9NNo9Yhulu_gX5Z~}QQ2&<EDiSMXfaw20`D7%r8>QZ&C77{(>Y3_
z6j5Z1Uc5FtPEpS_31HsgmSLHZijGb_p$WlRJ1p^_1!ZLP8kr6OtCEK7Qh267o$H>e
zf<4cNGQRk{g5h$XfvTFQ@`qm@iju83-~}ebAYpZryARHV<pnnVl6HqVd-~eq0b|^~
zXL7TnPTpIFQmhSB)b5l4$^x!j)+b-fpP-ynI=~SJ^DjV*^0_=%QVOFU^CF=~nZ^bZ
zrrop2nQF?<^#Rg=p4uupt9UUJV)dwPHPr*~OjUe%WL}<tq&t>R$AEt3229U{y@Fp4
z-8FBBtGG&(hTyUdx5ZOfiz`<AI)VX7bEFpu1-x0P81b(b4oI{%xs+nB+aMa0MJcbn
zhP1w3C>c=<0F%+w|Fl=rWk{K7>70k04SN?RU(^mrKSeKDqA!K^Hsv8C?#ioj4@WUL
zC*?{hTai6q0%_oBTqDHygp_Kl;({sAScYQIwMDM<s-CCk#Y$G$Wso4i5>1U>{x0ww
zve?_}E;DG?+|zsUrsph5X_G7l#Y~vqkq3@NNDabbw7|`eJBmn`Qrlr%?`va<J3V69
zXb#O%!_wLU1y<Jv5qIB>=mm$Mc{+FBbQbogAZ6{MuzT|P%QZZotd21eb1h<lbjWII
zJ~Gos^_!Z+jS<>fj|;GYAX&>bx#D5EB+=XMj<r12P7cqm7+N`>2XJkpnyMUykaVo)
zj3ZLqEl1&)Rturc8m@<Ex6KZzS6`#!al~-4tE^uvTOyR(MQ~K+RcWzvfHqB0k580{
z)X{VLE6qZJFkh0BJ1@`hLUnDQUgG0l;@p?R=_ZBnYtb3XYPC;uFo)oX@xM-ZqOz9=
zw$`!EQV)}*KwEb!jfNDVpu>+uUuD^vaNaSxGwP4dq0-OSb~62lPv8E_K4usLvG{Qg
zdR%z8dd2H!{JaT|X_bfm{##*W$YM;_J8Y8&Z)*<JSI-Ur%}(kH3&2X}J>ImOAf4+|
zEyi)qK%Ld1bHuqD+}-WiCnjszDeC-%8g+8JRpG1bOc!xUGB?@?6f~FTrI%U#5R~YF
z%t5(S2Q>?0`(XNHa8xKdTEZ~Z4SJOheit#ldfdg63}#W6j8kO;SjQD`vftxS+#x1B
zYu|5szEvkyz|}|B3x|DNlyi$;+n+cW$Hu+?)=X1!sa%{H-^;oBO9XACZJ}wkQ!sTa
zQ#J3h|HX{{&WwIG3h7d6aWktuJaO)ie6&=KJBoX@w(rBWfin`*a6OmCC5M0HzL(gv
zY<*e4hmW>SWVhxk-`UGOAbD%Hk+uu<^7zJ_ytVXamfqCd0$g+W08>?QAB}Cv{b}eM
z@X}ILg+uT%>-6`A25p@uhS3%;<rR|*N1kf&1P^IVMa6e|)S)1?<4{)#d_eV^^Cekg
zl8fq}b#YJ8rxZ%pb5Tv7+fJ_a2Mp|*BRbo8GN3gW)7>u>ccSq}8|H_^o&`nBT5S0y
z;2H0I^(4MO*S+(4l$gULc4KSeKvidto5Nl0P|<V_!btV;ljj-o{9cM<J#_JY-%hMg
zxQ&ZW)3*}NB~;BppsRUcYoBhnnGZMRJ8^M>%9CqQ*ikY!w_GUlo}sb9HYB=L^oFpJ
zfTQskXW!LFVnUo4(OHPDaZSf3zB|3{RGu1>ue<a*`=s_yvLbH%vcW@VCJ#aALQ|JL
zC^utq{CZyeeAeku^2h$gxq&1qRcIhf-9I(%ZJF$nJSyHp{#8N94N}m->E$(+dr?tT
zp!SGlqDU8vu{5x<AXek+rPq-Lbl+U{;7^^p@lQGIt;6y1z^{#4%9F+sflS3{B+&Ki
zxeJ9{9*Q^P*cQYVVeZlOA?UU22F2ap4a?F!j*lCdcfx4hjg~^5)`<u2$kg76XfYxs
zRmD~@S13dx>LWSvj+j$arHglg54#Lx&TvuO3LIIU>hF9Uoj&=-b*Q?uYr`#V?xz?2
zhirZrv^eA{k%{hFh%9LYVXEYWd5#PuUd1QqaqB*J!CMXEM>fEB$@#1>mtB`Bfil}t
zhhTIObqh5HRvT+4q_Do$Q<Iw$pOMZMQK<|=?I%P#z|B+&B)9IJK&qopTmxdSO3fH4
zKknW$aHwWWY|M{jqo*8_MV}M5RM;f+K_Hb0WjPm|jdWLgW%>*Jika?qV=Np-DtPkU
z(KoXyWLfPwr@UY1)hBAvR3nCBZgd|CevTG?H~HqDF}dzy%2sd2`f{^CBbTk*^K~RO
zN~O0+2EjAJlywF%SjgYz810l&G5AqzI<=Ber{912^PpSPRJl3dm8W@d<hpik9nByk
zKlDU#vYEHBs*poon6^}Uj-jr}+A-Fov6-<R=US6PG|nPnQIDuKB@<|RhVc)0WZ3p7
zNR+*I<d3Xo+K!O_n(wU0-g@0pkMmkTYPeHmh=K>KHL}7_@k3)Y!SXYkyxQy>Q4I2o
z<zo5B!6kC>r`ev7fLF$1t96h|sH<-#*YzGD-b^3$_!#wsh(Yw;)b@udLz9mm`mFYh
z1Zz24KIQJ(*_-E0(3&1InqG;U?wF<Ioa*U6`sI?EA4=z)6vf4hndRImU8^arKs_T9
z*3_5!LpI94-g<BaHDyKg)Rl(v#m(F`wOIFl_Dj3Q%A2R+t9C!Z*pN-%y7Twp_cuow
z`M>)GYd>DFo(em`#|UaaYmkA9;GTX7b?0@C@QkTVpGD#mf$<F^){<)_GYte|B<V_J
zqX%AQW#Rs?^H(vcX_CjEd-~S}Gf?=C3Qpl?9jkKo3)t@7%vvwwVq3@Gn9nF&e@&1N
zU&Er$C!LX__{~4B6~^)8Y?NI|gkCP~p(1)NtXw?!?t<2%JhI<XVukFgm7_Gz!^h6x
zA#Eh#=h)D#uoJBE$dMhd`;%S%L>dQoRNV=n{^Zi_W*ps;3?^$s`0;ER7;==~OmQ~9
zS5P=F<Clct8yi_gyp#8ZS@J^!F&w||`WQqsvXq~*8`$tI=4KUH$%eLSmTj$`MCB4U
z@}$IK#4o}vMIQD0NuFHaZ?wjdbnf>jxE5%|;xq6h4@!_h?@|aK&FYI2IT(OHXv2%1
zWEo-v!L7x^YT(xLVHlpJttcwaF@1Y;-S*q3CRa!g7xdzl|Jan>2#dI0`LKl!T1GMk
zRKe4|bQO&ET}Z^Aiym*HII>cSxIzl|F~JEUGxz;+DB=8fxX<z#)zw~yn<$bV824{{
z8QIj?)*1uU?uT+8V==gDksU}8_A%Fjhgm`9_#I_cJF#P%EGR+UO_Vr(h*Vco$b`d+
zGw}KepE%9uGHi)oXCkQAb4Gz3N>hnBI4R12q6ews$lA`Jfi}r@A@-)6TOAUMNYFYJ
zZ-Zd?lxFTyjN3mXnL!%#>Z%$0gJ4*9g;e;@zSmQ{eGGDaRRNM3s@6!;hYuVc=c+3B
z=qzNNS~n^EsJU4aOGE|mdy={C^lPKEfPL-IJAsTpQsDgZ@~s+eHZYmp9<kk{c{<R?
z@ACtxBu*G*v&O}re7*K!yU$MOzYhmliycu)_|S4`g(sa+SDrLCQut<=g{o0wBK(pV
zG1u(ptL&#?WO=J^V<AhlPZ~?uD+}1ms3?9AC-yMz24O*k-=aeNaiN|M6`8KQA4yeF
zJgCG1nJ-ytSSbt<_38e;A4E&`AS||~_E;>yb=YW_4r?lqQaYZQ`nau){W`LY#P)>i
zq^wHEuOYs#FlPZeMuT@Etb@~A6feCebq`miJE3w+gAL%bVF_s*5e*@)?xmKSo%I3?
zLE<Tr7a_+kW+<L&mYH|oQ~JO1uD+15+g^iRGl9<UKS$9DpP96;Cxxg_r`99$1{~*V
ztPe%kK0U!<xi*#2<BUM5Ym6?~rCzZf2sm&0<|wdiz!urLcYnpGIQODIwb9Io)bHo}
zC0=Sqg!NKa8aTX)|Ffq(74y`eJzD4<S{ivm@tKXnkPaokY^p^LDG>LHVdWia$}~s6
zr!^LfxSSB4Td&9iTXrzQpl5ZDo#SdmNr;23QsPHQ!x!UT9xtb!Ycz^JF8x)%cFOXK
z^EXw%dRz_VD}<c`?e*L7tL9gT&i6x#g;!bLl%8DfV&Q)dtmLTtQQ-fM0{nw(nizX)
zasM}h2GEnv;QtSpfZvnG5B`k`7_hJy|0YoXxAKF%Nr7N)%D+kVT_EZQKM2k6ublZI
z3-V^XmHkW%K>7?RU^4{)1+xFO=z!EI8IUa3U*rag=1BpHX$Xi<__kSbS{y_xa*MJv
z_`thq0Z^sPzjAk48ssDQj}!$N8Q$XC84(bU$t_Bm69Jf+C!h_}e<V3TvrG!u&q6>p
zwzpQj9sRA94<{x3{~z&ix-DwX;RAzka)4-#6ZHJqKh|SVuO|>Yrv+m30+!|sK<-|E
z=)5E->#y<_1V|T1f%<s}h|~A4qy={8H9@m4f#t*pfboJH$Rp?$2azPVjgt!y&<OI@
zB3={$QKSDNGk{oxfk2_R_<2zQR2cCO;sGR4M1aH+CnzoY*1C?N1Ev>Af!ZYqXg}`O
zI$qKOWdnclF`%_Z`WGOe{`A`l-#a?s=Q1a#@BOWmExH2;Wl`OB!B-%lq3nO{4=WO&
z#k_x|N&(qzm*6S{G*|GCegF2N2ulC+(58z2DG~yUs}i8zvRf&$CJCaexJ6Xu!`qz(
z)*v8*kAE#D0KCo*s{8^Rbg=`*E2MzeIt0|x55%n-gO&yX#$l=3W7-_~&(G8j1E(XB
hw}tl`5K!1C(72%nnjQrp<7@!WCh47rWB+@R{{wClNUHz<

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bb8b2fc..6c9a224 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51..4f906e0 100755
--- a/gradlew
+++ b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 5093609..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index f1d555b..e67eedf 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -13,14 +13,14 @@ import java.time.*;
  */
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
-    public static final String VERSION = "0.8.0-beta+085";
+    public static final String VERSION = "0.8.0-beta+104";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1595378887339L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1597698016009L), ZoneId.systemDefault());
 
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
-    public static final String BUILDMETA = "085";
+    public static final String BUILDMETA = "104";
     public static final String PRERELEASE = "beta";
 
     public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
diff --git a/version.properties b/version.properties
index beae2a7..c710651 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Jun 19 18:39:50 PDT 2020
-version.buildmeta=047
+#Mon Aug 17 14:00:15 PDT 2020
+version.buildmeta=104
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+047
+version.semver=0.8.0-beta+104

From 549810b4bbef554d49ac8819bed62d2eb38b0fda Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 1 Dec 2020 00:56:52 -0800
Subject: [PATCH 082/262] Updated dependencies.

---
 .idea/mobibot.iml                        |  2 +-
 .idea/modules/mobibot.main.iml           | 34 ++++++-------
 .idea/modules/mobibot.test.iml           | 36 +++++++-------
 build.gradle                             | 63 +++++++++++-------------
 config/pmd.xml                           | 27 ++++++----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 6 files changed, 83 insertions(+), 81 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 5d44a1f..4e2a94b 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+097" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+122" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 23cf1cb..4c69bb2 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+097" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+122" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$MAVEN_REPOSITORY$/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.30/459999be0d6ac844dd3d2ca85c2daf14deb5f7f0/kotlin-stdlib-jdk8-1.3.30.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.3.9/4be434f5e86c1998a273e7f19a7286440894f0b0/kotlinx-coroutines-core-jvm-1.3.9.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.30/bf0edcf669e446e0d903a0681190d1e3df969ac4/kotlin-stdlib-jdk7-1.3.30.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.1.1/f2c06572ee999f374c0849d696305d203bf9c3e/spotbugs-annotations-4.1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7/11481f2c9feeb0e9b1b828953f2d4ba2f9b2753c/commons-net-3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.0/e3765b66f0610afc92053ff1a93a87a544fca2b/kotlin-stdlib-jdk8-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.3.9/4be434f5e86c1998a273e7f19a7286440894f0b0/kotlinx-coroutines-core-jvm-1.3.9.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.1.2/9b082a619fb7deeac71684462c2804c76e0df694/spotbugs-annotations-4.1.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7/11481f2c9feeb0e9b1b828953f2d4ba2f9b2753c/commons-net-3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -48,37 +48,37 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
+    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7" level="project" />
+    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
+    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
-    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.30" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.3.9" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.30" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 28d189b..70e2107 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+097" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+122" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.3.30/459999be0d6ac844dd3d2ca85c2daf14deb5f7f0/kotlin-stdlib-jdk8-1.3.30.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.3.9/4be434f5e86c1998a273e7f19a7286440894f0b0/kotlinx-coroutines-core-jvm-1.3.9.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.30/bf0edcf669e446e0d903a0681190d1e3df969ac4/kotlin-stdlib-jdk7-1.3.30.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7/11481f2c9feeb0e9b1b828953f2d4ba2f9b2753c/commons-net-3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.1.1/f2c06572ee999f374c0849d696305d203bf9c3e/spotbugs-annotations-4.1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.16.1/6e772120aff69ca3d1583b3d1b36b7529de43ba1/assertj-core-3.16.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.0/e3765b66f0610afc92053ff1a93a87a544fca2b/kotlin-stdlib-jdk8-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.3.9/4be434f5e86c1998a273e7f19a7286440894f0b0/kotlinx-coroutines-core-jvm-1.3.9.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7/11481f2c9feeb0e9b1b828953f2d4ba2f9b2753c/commons-net-3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.1.2/9b082a619fb7deeac71684462c2804c76e0df694/spotbugs-annotations-4.1.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.17.1/a0dbfb44443b97255b775602f15dfa1332ae8c57/assertj-core-3.17.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -54,43 +54,43 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="mobibot.main" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
+    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7" level="project" />
+    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
+    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
-    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.1.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.17.1" level="project" />
     <orderEntry type="library" name="Gradle: org.testng:testng:7.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.16.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.30" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.3.9" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: com.google.inject:guice:no_aop:4.2.2" level="project" />
     <orderEntry type="library" name="Gradle: com.beust:jcommander:1.78" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.10.3" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.21" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.30" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:guava:25.1-android" level="project" />
     <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
diff --git a/build.gradle b/build.gradle
index 302e536..55950b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 plugins {
     id 'application'
     id 'checkstyle'
-    id 'com.github.ben-manes.versions' version '0.29.0'
-    id 'com.github.spotbugs' version '4.5.0'
+    id 'com.github.ben-manes.versions' version '0.36.0'
+    id 'com.github.spotbugs' version '4.6.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.11.0'
+    id 'io.gitlab.arturbosch.detekt' version '1.15.0-RC1'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.4.0'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.20'
     id 'org.sonarqube' version '3.0'
     id 'pmd'
 }
@@ -22,8 +22,10 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
-    log4j   : '2.13.3',
-    spotbugs: '4.1.1'
+    jacoco  : '0.8.6',
+    log4j   : '2.14.0',
+    pmd     : '6.29.0',
+    spotbugs: '4.2.0'
 ]
 
 repositories {
@@ -36,41 +38,34 @@ dependencies {
     annotationProcessor semverProcessor
     compileOnly semverProcessor
 
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
-
     implementation 'pircbot:pircbot:1.5.0'
     compileOnly 'pircbot:pircbot:1.5.0:sources'
 
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
+
+    implementation 'com.rometools:rome:1.15.0'
+    implementation 'commons-cli:commons-cli:1.4'
+    implementation 'commons-net:commons-net:3.7.2'
+    implementation 'net.aksingh:owm-japis:2.5.3.0'
+    implementation 'net.objecthunter:exp4j:0.4.8'
+    implementation 'net.thauvin.erik:pinboard-poster:1.0.1'
+    implementation 'org.apache.commons:commons-lang3:3.11'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
+    implementation 'org.json:json:20201115'
+    implementation 'org.jsoup:jsoup:1.13.1'
+    implementation 'org.twitter4j:twitter4j-core:4.0.7'
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
 
-    implementation 'org.apache.commons:commons-lang3:3.11'
-    implementation 'commons-cli:commons-cli:1.4'
-
-    implementation 'commons-net:commons-net:3.7'
-
-    implementation 'com.rometools:rome:1.15.0'
-
-    implementation 'org.json:json:20200518'
-    implementation 'org.jsoup:jsoup:1.13.1'
-    implementation 'net.objecthunter:exp4j:0.4.8'
-
-    implementation 'org.twitter4j:twitter4j-core:4.0.7'
-    implementation 'net.thauvin.erik:pinboard-poster:1.0.1'
-
-    implementation 'net.aksingh:owm-japis:2.5.3.0'
-
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
-
-    testImplementation 'org.testng:testng:7.3.0'
-    testImplementation 'org.assertj:assertj-core:3.16.1'
-
-    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
-    spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
-
     compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
     testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
+
+    testImplementation 'org.assertj:assertj-core:3.18.1'
+    testImplementation 'org.testng:testng:7.3.0'
+
+    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'
+    spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
 }
 
 test {
@@ -117,7 +112,7 @@ spotbugs {
 }
 
 pmd {
-    toolVersion = '6.25.0'
+    toolVersion = versions.pmd
     ignoreFailures = true
     ruleSets = []
     ruleSetFiles = files("${projectDir}/config/pmd.xml")
@@ -167,7 +162,7 @@ sonarqube {
 }
 
 jacoco {
-    toolVersion = '0.8.5'
+    toolVersion = versions.jacoco
 }
 
 jacocoTestReport {
diff --git a/config/pmd.xml b/config/pmd.xml
index 8d35af0..dc39dbb 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -1,31 +1,34 @@
 <?xml version="1.0"?>
 <ruleset name="erik"
-         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
     <description>Erik's Ruleset</description>
     <!-- BEST PRACTICES -->
-    <!--    <rule ref="category/java/bestpractices.xml/AvoidStringBufferField"/>-->
+    <rule ref="category/java/bestpractices.xml/AvoidMessageDigestField"/>
+    <!-- <rule ref="category/java/bestpractices.xml/AvoidStringBufferField"/> -->
     <rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
     <rule ref="category/java/bestpractices.xml/CheckResultSet"/>
     <rule ref="category/java/bestpractices.xml/ConstantsInInterface"/>
     <rule ref="category/java/bestpractices.xml/DefaultLabelNotLastInSwitchStmt"/>
+    <rule ref="category/java/bestpractices.xml/DoubleBraceInitialization"/>
     <rule ref="category/java/bestpractices.xml/ForLoopCanBeForeach"/>
     <rule ref="category/java/bestpractices.xml/GuardLogStatement"/>
+    <rule ref="category/java/bestpractices.xml/LiteralsFirstInComparisons" />
     <!-- <rule ref="category/java/bestpractices.xml/LooseCoupling"/> -->
     <rule ref="category/java/bestpractices.xml/MethodReturnsInternalArray"/>
     <rule ref="category/java/bestpractices.xml/MissingOverride">
         <properties>
-            <property name="violationSuppressXPath"
-                      value="//MethodDeclaration[@Name='hashCode' or @Name='equals' or @Name='toString']"/>
+            <property name="violationSuppressXPath" value="//MethodDeclaration[@Name='hashCode' or @Name='equals' or @Name='toString']"/>
         </properties>
     </rule>
+    <rule ref="category/java/bestpractices.xml/OneDeclarationPerLine"/>
     <rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
     <rule ref="category/java/bestpractices.xml/ReplaceEnumerationWithIterator"/>
     <!-- <rule ref="category/java/bestpractices.xml/ReplaceHashtableWithMap"/>
     <rule ref="category/java/bestpractices.xml/ReplaceVectorWithList"/> -->
     <rule ref="category/java/bestpractices.xml/SwitchStmtsShouldHaveDefault"/>
     <rule ref="category/java/bestpractices.xml/SystemPrintln"/>
+    <rule ref="category/java/bestpractices.xml/UnusedAssignment"/>
     <rule ref="category/java/bestpractices.xml/UnusedFormalParameter"/>
     <rule ref="category/java/bestpractices.xml/UnusedImports"/>
     <rule ref="category/java/bestpractices.xml/UnusedLocalVariable"/>
@@ -40,11 +43,12 @@
 
 
     <!-- NAMING CONVENTIONS -->
+    <!-- <rule ref="category/java/codestyle.xml/ClassNamingConventions"/> -->
     <rule ref="category/java/codestyle.xml/FormalParameterNamingConventions"/>
     <rule ref="category/java/codestyle.xml/GenericsNaming"/>
     <rule ref="category/java/codestyle.xml/LocalVariableNamingConventions"/>
     <rule ref="category/java/codestyle.xml/MethodNamingConventions"/>
-    <!--    <rule ref="category/java/codestyle.xml/PackageCase"/>-->
+    <!-- <rule ref="category/java/codestyle.xml/PackageCase"/> -->
 
 
     <!-- OTHER -->
@@ -71,7 +75,9 @@
     <rule ref="category/java/codestyle.xml/UnnecessaryConstructor"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryLocalBeforeReturn"/>
+    <!-- <rule ref="category/java/codestyle.xml/UnnecessaryModifier"/> -->
     <rule ref="category/java/codestyle.xml/UnnecessaryReturn"/>
+    <!-- <rule ref="category/java/codestyle.xml/UselessParentheses"/> -->
     <rule ref="category/java/codestyle.xml/UselessQualifiedThis"/>
 
 
@@ -87,7 +93,7 @@
     <rule ref="category/java/design.xml/DataClass"/>
     <rule ref="category/java/design.xml/DoNotExtendJavaLangError"/>
     <rule ref="category/java/design.xml/ExceptionAsFlowControl"/>
-    <!--    <rule ref="category/java/design.xml/ExcessivePublicCount"/>-->
+    <!-- <rule ref="category/java/design.xml/ExcessivePublicCount"/> -->
     <rule ref="category/java/design.xml/FinalFieldCouldBeStatic"/>
     <rule ref="category/java/design.xml/ImmutableField"/>
     <rule ref="category/java/design.xml/LogicInversion"/>
@@ -144,7 +150,7 @@
     <rule ref="category/java/errorprone.xml/CloneThrowsCloneNotSupportedException"/>
     <rule ref="category/java/errorprone.xml/CloseResource"/>
     <rule ref="category/java/errorprone.xml/CompareObjectsWithEquals"/>
-    <rule ref="category/java/errorprone.xml/ConstructorCallsOverridableMethod"/>>
+    <rule ref="category/java/errorprone.xml/ConstructorCallsOverridableMethod"/>
     <rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
     <rule ref="category/java/errorprone.xml/DoNotExtendJavaLangThrowable"/>
     <rule ref="category/java/errorprone.xml/DoNotHardCodeSDCard"/>
@@ -171,7 +177,7 @@
     <rule ref="category/java/errorprone.xml/MoreThanOneLogger"/>
     <rule ref="category/java/errorprone.xml/NonCaseLabelInSwitchStatement"/>
     <rule ref="category/java/errorprone.xml/NonStaticInitializer"/>
-    <!--    <rule ref="category/java/errorprone.xml/NullAssignment"/>-->
+    <!-- <rule ref="category/java/errorprone.xml/NullAssignment"/> -->
     <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode"/>
     <rule ref="category/java/errorprone.xml/ProperCloneImplementation"/>
     <rule ref="category/java/errorprone.xml/ProperLogger"/>
@@ -221,6 +227,7 @@
     <rule ref="category/java/multithreading.xml/DontCallThreadRun"/>
     <rule ref="category/java/multithreading.xml/DoubleCheckedLocking"/>
     <rule ref="category/java/multithreading.xml/NonThreadSafeSingleton"/>
+    <rule ref="category/java/multithreading.xml/UnsynchronizedStaticFormatter"/>
     <rule ref="category/java/multithreading.xml/UseConcurrentHashMap"/>
     <rule ref="category/java/multithreading.xml/UseNotifyAllInsteadOfNotify"/>
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6c9a224..4d9ca16 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 3bd66fb1c4c9c0412cd5beb4b94df850a98d9824 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 1 Dec 2020 00:57:35 -0800
Subject: [PATCH 083/262] Cleanup.

---
 .../thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java    | 3 +++
 .../java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
index a921c7c..6be49cd 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
@@ -32,6 +32,7 @@
 
 package net.thauvin.erik.mobibot.commands.tell;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.logging.log4j.Logger;
 
 import java.io.BufferedInputStream;
@@ -49,6 +50,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+
 /**
  * The Tell Messages Manager.
  *
@@ -87,6 +89,7 @@ final class TellMessagesMgr {
      * @return The {@link TellMessage} array.
      */
     @SuppressWarnings("unchecked")
+    @SuppressFBWarnings("OBJECT_DESERIALIZATION")
     public static List<TellMessage> load(final String file, final Logger logger) {
         try {
             try (final ObjectInput input = new ObjectInputStream(
diff --git a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java
index 9c32598..68550bc 100644
--- a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java
@@ -67,7 +67,7 @@ public class EntryLinkTest {
         }
 
         final SecureRandom r = new SecureRandom();
-        for (i = 0; entryLink.getCommentsCount() > 0; i++) {
+        while (entryLink.getCommentsCount() > 0) {
             entryLink.deleteComment(r.nextInt(entryLink.getCommentsCount()));
         }
         assertThat(entryLink.hasComments()).as("hasComments()").isFalse();

From fa4457a6f6ea738a8e51d243e9c1786a3d9b83ff Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 1 Dec 2020 00:58:21 -0800
Subject: [PATCH 084/262] Version 0.8.0-beta+125

---
 .../java/net/thauvin/erik/mobibot/ReleaseInfo.java          | 6 +++---
 version.properties                                          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index e67eedf..b4d9e77 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -13,14 +13,14 @@ import java.time.*;
  */
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
-    public static final String VERSION = "0.8.0-beta+104";
+    public static final String VERSION = "0.8.0-beta+125";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1597698016009L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1606812548443L), ZoneId.systemDefault());
 
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
-    public static final String BUILDMETA = "104";
+    public static final String BUILDMETA = "125";
     public static final String PRERELEASE = "beta";
 
     public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
diff --git a/version.properties b/version.properties
index c710651..ea8fc92 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Aug 17 14:00:15 PDT 2020
-version.buildmeta=104
+#Tue Dec 01 00:49:06 PST 2020
+version.buildmeta=125
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+104
+version.semver=0.8.0-beta+125

From 9c1ab833dad32e489dd486d30553b139386177b5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 2 Dec 2020 01:48:19 -0800
Subject: [PATCH 085/262] Converted modules to Kotlin.

---
 .idea/codeStyles/Project.xml                  | 356 ++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml          |   1 +
 .idea/mobibot.iml                             |   2 +-
 .idea/modules/mobibot.main.iml                |  36 +-
 .idea/modules/mobibot.test.iml                |  38 +-
 config/detekt/baseline.xml                    |  46 +++
 .../mobibot/{Constants.java => Constants.kt}  |  62 +--
 .../net/thauvin/erik/mobibot/FeedReader.java  | 107 -----
 .../net/thauvin/erik/mobibot/FeedReader.kt    |  85 ++++
 .../net/thauvin/erik/mobibot/Mobibot.java     |  12 +-
 .../thauvin/erik/mobibot/TwitterOAuth.java    |  11 +-
 .../java/net/thauvin/erik/mobibot/Utils.java  | 388 ------------------
 .../java/net/thauvin/erik/mobibot/Utils.kt    | 301 ++++++++++++++
 .../erik/mobibot/commands/AbstractCommand.kt  |   3 +-
 .../thauvin/erik/mobibot/commands/Cycle.kt    |   5 +-
 .../thauvin/erik/mobibot/commands/Info.java   |  12 +-
 .../erik/mobibot/commands/tell/Tell.java      |   7 +-
 .../erik/mobibot/entries/EntriesUtils.java    |   3 +-
 .../erik/mobibot/modules/AbstractModule.java  | 173 --------
 .../erik/mobibot/modules/AbstractModule.kt    | 131 ++++++
 .../thauvin/erik/mobibot/modules/Calc.java    |  99 -----
 .../net/thauvin/erik/mobibot/modules/Calc.kt} |  68 +--
 .../mobibot/modules/CurrencyConverter.java    | 253 ------------
 .../erik/mobibot/modules/CurrencyConverter.kt | 234 +++++++++++
 .../thauvin/erik/mobibot/modules/Dice.java    |  98 -----
 .../net/thauvin/erik/mobibot/modules/Dice.kt  | 103 +++++
 .../erik/mobibot/modules/GoogleSearch.java    | 147 -------
 .../erik/mobibot/modules/GoogleSearch.kt      | 125 ++++++
 .../thauvin/erik/mobibot/modules/Joke.java    | 110 -----
 .../net/thauvin/erik/mobibot/modules/Joke.kt  | 100 +++++
 .../thauvin/erik/mobibot/modules/Lookup.java  | 193 ---------
 .../thauvin/erik/mobibot/modules/Lookup.kt    | 169 ++++++++
 .../erik/mobibot/modules/ModuleException.java | 117 ------
 .../erik/mobibot/modules/ModuleException.kt   |  89 ++++
 .../thauvin/erik/mobibot/modules/Ping.java    |  95 -----
 .../net/thauvin/erik/mobibot/modules/Ping.kt  |  90 ++++
 .../erik/mobibot/modules/RockPaperScissors.kt |  31 +-
 .../erik/mobibot/modules/StockQuote.java      | 218 ----------
 .../erik/mobibot/modules/StockQuote.kt        | 214 ++++++++++
 ...{ThreadedModule.java => ThreadedModule.kt} |  44 +-
 .../thauvin/erik/mobibot/modules/Twitter.java | 279 -------------
 .../thauvin/erik/mobibot/modules/Twitter.kt   | 244 +++++++++++
 .../net/thauvin/erik/mobibot/modules/War.java |  18 +-
 .../erik/mobibot/modules/Weather2.java        | 232 -----------
 .../thauvin/erik/mobibot/modules/Weather2.kt  | 200 +++++++++
 .../erik/mobibot/modules/WorldTime.java       | 247 -----------
 .../thauvin/erik/mobibot/modules/WorldTime.kt | 219 ++++++++++
 .../thauvin/erik/mobibot/msg/ErrorMessage.kt  |   6 +-
 .../net/thauvin/erik/mobibot/msg/Message.kt   |  10 -
 .../thauvin/erik/mobibot/msg/NoticeMessage.kt |   6 +-
 .../erik/mobibot/msg/PrivateMessage.kt        |   6 +-
 .../thauvin/erik/mobibot/msg/PublicMessage.kt |   6 +-
 .../net/thauvin/erik/mobibot/UtilsTest.java   |   2 +-
 .../modules/{CalcTest.java => CalcTest.kt}    |  40 +-
 .../modules/CurrencyConverterTest.java        |  73 ----
 ...okupTest.java => CurrencyConverterTest.kt} |  54 ++-
 .../thauvin/erik/mobibot/modules/DiceTest.kt  |  52 +++
 .../mobibot/modules/GoogleSearchTest.java     |  90 ----
 .../erik/mobibot/modules/GoogleSearchTest.kt  |  72 ++++
 .../modules/{JokeTest.java => JokeTest.kt}    |  31 +-
 .../{WordTimeTest.java => LookupTest.kt}      |  37 +-
 .../mobibot/modules/ModuleExceptionTest.java  |  20 +-
 .../modules/{PingTest.java => PingTest.kt}    |  29 +-
 .../mobibot/modules/RockPaperScissorsTest.kt  |   1 -
 .../erik/mobibot/modules/StockQuoteTest.java  |  90 ----
 .../erik/mobibot/modules/StockQuoteTest.kt    |  73 ++++
 .../{TwitterTest.java => TwitterTest.kt}      |  57 ++-
 .../erik/mobibot/modules/Weather2Test.java    |  80 ----
 .../erik/mobibot/modules/Weather2Test.kt      |  60 +++
 .../erik/mobibot/modules/WordTimeTest.kt      |  49 +++
 70 files changed, 3313 insertions(+), 3446 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml
 rename src/main/java/net/thauvin/erik/mobibot/{Constants.java => Constants.kt} (65%)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/FeedReader.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/Utils.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/Utils.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
 rename src/{test/java/net/thauvin/erik/mobibot/modules/AbstractModuleTest.java => main/java/net/thauvin/erik/mobibot/modules/Calc.kt} (54%)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
 rename src/main/java/net/thauvin/erik/mobibot/modules/{ThreadedModule.java => ThreadedModule.kt} (64%)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
 rename src/test/java/net/thauvin/erik/mobibot/modules/{CalcTest.java => CalcTest.kt} (63%)
 delete mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
 rename src/test/java/net/thauvin/erik/mobibot/modules/{LookupTest.java => CurrencyConverterTest.kt} (56%)
 create mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
 delete mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
 create mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
 rename src/test/java/net/thauvin/erik/mobibot/modules/{JokeTest.java => JokeTest.kt} (69%)
 rename src/test/java/net/thauvin/erik/mobibot/modules/{WordTimeTest.java => LookupTest.kt} (66%)
 rename src/test/java/net/thauvin/erik/mobibot/modules/{PingTest.java => PingTest.kt} (75%)
 delete mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
 create mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
 rename src/test/java/net/thauvin/erik/mobibot/modules/{TwitterTest.java => TwitterTest.kt} (62%)
 delete mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
 create mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt
 create mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..10683d5
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,356 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="ANNOTATION_PARAMETER_WRAP" value="2" />
+      <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
+      <option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value>
+          <package name="java.awt" withSubpackages="false" static="false" />
+        </value>
+      </option>
+      <option name="JD_INDENT_ON_CONTINUATION" value="true" />
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
+      <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="RESOURCE_LIST_WRAP" value="1" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="THROWS_LIST_WRAP" value="1" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="FOR_STATEMENT_WRAP" value="1" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="ASSERT_STATEMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+      <option name="WRAP_LONG_LINES" value="true" />
+      <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
+      <option name="ENUM_CONSTANTS_WRAP" value="1" />
+      <indentOptions>
+        <option name="USE_RELATIVE_INDENTS" value="true" />
+      </indentOptions>
+      <arrangement>
+        <groups>
+          <group>
+            <type>OVERRIDDEN_METHODS</type>
+            <order>BY_NAME</order>
+          </group>
+        </groups>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <FINAL>true</FINAL>
+                  <PUBLIC>true</PUBLIC>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <FINAL>true</FINAL>
+                  <PROTECTED>true</PROTECTED>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <FINAL>true</FINAL>
+                  <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <FINAL>true</FINAL>
+                  <PRIVATE>true</PRIVATE>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PUBLIC>true</PUBLIC>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PROTECTED>true</PROTECTED>
+                  <STATIC>true</STATIC>
+                  <visibility />
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PRIVATE>true</PRIVATE>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <FINAL>true</FINAL>
+                  <PUBLIC>true</PUBLIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <FINAL>true</FINAL>
+                  <PROTECTED>true</PROTECTED>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <FINAL>true</FINAL>
+                  <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <FINAL>true</FINAL>
+                  <PRIVATE>true</PRIVATE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PUBLIC>true</PUBLIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PROTECTED>true</PROTECTED>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PRIVATE>true</PRIVATE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <FIELD>true</FIELD>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <CONSTRUCTOR>true</CONSTRUCTOR>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <METHOD>true</METHOD>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <METHOD>true</METHOD>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <ENUM>true</ENUM>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <INTERFACE>true</INTERFACE>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <CLASS>true</CLASS>
+                  <STATIC>true</STATIC>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <CLASS>true</CLASS>
+              </match>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index d91f848..23f4bb5 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="Erik's Code Style" />
   </state>
 </component>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 4e2a94b..7d99ee9 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+122" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+147" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 4c69bb2..cc8a457 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+122" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+147" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.0/e3765b66f0610afc92053ff1a93a87a544fca2b/kotlin-stdlib-jdk8-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.3.9/4be434f5e86c1998a273e7f19a7286440894f0b0/kotlinx-coroutines-core-jvm-1.3.9.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.1.2/9b082a619fb7deeac71684462c2804c76e0df694/spotbugs-annotations-4.1.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7/11481f2c9feeb0e9b1b828953f2d4ba2f9b2753c/commons-net-3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -20,11 +20,11 @@
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.0/52ac54a56c9121f54fcca387c5a0f441d1af9be8/kotlin-script-runtime-1.4.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.0/9c5c5503c8f96b477661789168b3f4a3c61a6c6e/kotlin-scripting-common-1.4.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.0/d807bf2ab36765af04b29319989322efd5ad1401/kotlin-scripting-jvm-1.4.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.20/9793d2f6b262847a2d8127951c5786cf907cc7b1/kotlin-script-runtime-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.20/2e2bf29688a76cec111df56bc5e358c5bbc5057/kotlin-scripting-common-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.20/83704fbbe39946cc2ac6d0f07f41947abeb8dc20/kotlin-scripting-jvm-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar" />
               <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
             </array>
@@ -50,35 +50,35 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.20" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.1.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7" level="project" />
+    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.3.9" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 70e2107..b0c7198 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+122" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+147" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.0/e3765b66f0610afc92053ff1a93a87a544fca2b/kotlin-stdlib-jdk8-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.3.9/4be434f5e86c1998a273e7f19a7286440894f0b0/kotlinx-coroutines-core-jvm-1.3.9.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7/11481f2c9feeb0e9b1b828953f2d4ba2f9b2753c/commons-net-3.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20200518/41a767de4bde8f01d53856b905c49b2db8862f13/json-20200518.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.13.3/4e857439fc4fe974d212adaaaa3b118b8b50e3ec/log4j-core-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.13.3/7cca27a921a18645139cf651c04b83b1a19cfd76/log4j-slf4j-impl-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.13.3/ec1508160b93d274b1add34419b897bae84c6ca9/log4j-api-2.13.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.1.2/9b082a619fb7deeac71684462c2804c76e0df694/spotbugs-annotations-4.1.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.17.1/a0dbfb44443b97255b775602f15dfa1332ae8c57/assertj-core-3.17.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.18.1/aaa02680dd92a568a4278bb40aa4a6305f632ec0/assertj-core-3.18.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -27,11 +27,11 @@
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.0/52ac54a56c9121f54fcca387c5a0f441d1af9be8/kotlin-script-runtime-1.4.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.0/9c5c5503c8f96b477661789168b3f4a3c61a6c6e/kotlin-scripting-common-1.4.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.0/d807bf2ab36765af04b29319989322efd5ad1401/kotlin-scripting-jvm-1.4.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.20/9793d2f6b262847a2d8127951c5786cf907cc7b1/kotlin-script-runtime-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.20/2e2bf29688a76cec111df56bc5e358c5bbc5057/kotlin-scripting-common-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.20/83704fbbe39946cc2ac6d0f07f41947abeb8dc20/kotlin-scripting-jvm-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar" />
               <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
             </array>
@@ -56,29 +56,29 @@
     <orderEntry type="module" module-name="mobibot.main" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.20" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7" level="project" />
+    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
     <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20200518" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
     <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
     <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.13.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.13.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.1.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.17.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.18.1" level="project" />
     <orderEntry type="library" name="Gradle: org.testng:testng:7.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.3.9" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
@@ -89,7 +89,7 @@
     <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.10.3" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:guava:25.1-android" level="project" />
     <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 93d9e37..ed4ec34 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -2,18 +2,64 @@
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
+    <ID>ComplexMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>LongMethod:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>LongMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
+    <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
     <ID>MagicNumber:Comment.kt$Comment$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$11</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$33</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$4</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$8</ID>
     <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
+    <ID>MagicNumber:Dice.kt$Dice$7</ID>
     <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
     <ID>MagicNumber:Modules.kt$Modules$7</ID>
     <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
+    <ID>MagicNumber:Twitter.kt$Twitter$1000L</ID>
+    <ID>MagicNumber:Twitter.kt$Twitter$60L</ID>
     <ID>MagicNumber:Users.kt$Users$8</ID>
+    <ID>MagicNumber:Utils.kt$Utils.Companion$30</ID>
+    <ID>MagicNumber:Utils.kt$Utils.Companion$365</ID>
+    <ID>MagicNumber:Utils.kt$Utils.Companion$7</ID>
     <ID>MagicNumber:View.kt$View$8</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$1.60934</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$32</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$5</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$9</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime$17</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3600</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$60</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$86.4</ID>
+    <ID>MemberNameEqualsClassName:Calc.kt$Calc.Companion$ @JvmStatic fun calc(query: String): String</ID>
+    <ID>MemberNameEqualsClassName:Lookup.kt$Lookup.Companion$ @JvmStatic @Throws(UnknownHostException::class) fun lookup(query: String): String</ID>
+    <ID>MemberNameEqualsClassName:WorldTime.kt$WorldTime.Companion$ @JvmStatic fun worldTime(query: String): Message</ID>
     <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.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
+    <ID>NestedBlockDepth:FeedReader.kt$FeedReader$ override fun run()</ID>
+    <ID>NestedBlockDepth:GoogleSearch.kt$GoogleSearch$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
+    <ID>NestedBlockDepth:Lookup.kt$Lookup$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
+    <ID>NestedBlockDepth:StockQuote.kt$StockQuote$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
+    <ID>NestedBlockDepth:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
+    <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
+    <ID>ReturnCount:Utils.kt$Utils.Companion$ @JvmStatic fun colorize(s: String?, color: String): String</ID>
+    <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
+    <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
+    <ID>ThrowsCount:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>TooGenericExceptionCaught:FeedReader.kt$FeedReader$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:StockQuote.kt$StockQuote.Companion$e: NullPointerException</ID>
+    <ID>TooGenericExceptionCaught:Weather2.kt$Weather2.Companion$e: NullPointerException</ID>
+    <ID>TooManyFunctions:Utils.kt$Utils$Companion</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.java b/src/main/java/net/thauvin/erik/mobibot/Constants.kt
similarity index 65%
rename from src/main/java/net/thauvin/erik/mobibot/Constants.java
rename to src/main/java/net/thauvin/erik/mobibot/Constants.kt
index ee86294..4f3d1ae 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.kt
@@ -1,5 +1,5 @@
 /*
- * Constants.java
+ * Constants.kt
  *
  * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -29,81 +29,81 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot
 
-package net.thauvin.erik.mobibot;
-
-import java.util.Locale;
+import java.util.*
 
 /**
- * The <code>Constants</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-19
- * @since 1.0
+ * The `Constants` class.
  */
-public final class Constants {
+object Constants {
     /**
      * The connect/read timeout in ms.
      */
-    public static final int CONNECT_TIMEOUT = 5000;
+    const val CONNECT_TIMEOUT = 5000
+
     /**
      * Debug command line argument.
      */
-    public static final String DEBUG_ARG = "debug";
+    const val DEBUG_ARG = "debug"
+
     /**
      * The debug command.
      */
-    public static final String DEBUG_CMD = "debug";
+    const val DEBUG_CMD = "debug"
+
     /**
      * Default IRC Port.
      */
-    public static final int DEFAULT_PORT = 6667;
+    const val DEFAULT_PORT = 6667
+
     /**
      * Default IRC Server.
      */
-    public static final String DEFAULT_SERVER = "irc.freenode.net";
+    const val DEFAULT_SERVER = "irc.freenode.net"
+
     /**
      * The die command.
      */
-    public static final String DIE_CMD = "die";
+    const val DIE_CMD = "die"
+
     /**
      * Help command line argument.
      */
-    public static final String HELP_ARG = "help";
+    const val HELP_ARG = "help"
+
     /**
      * The help command.
      */
-    public static final String HELP_CMD = "help";
+    const val HELP_CMD = "help"
+
     /**
      * The link command.
      */
-    public static final String LINK_CMD = "L";
+    const val LINK_CMD = "L"
+
     /**
      * Default locale.
      */
-    public static final Locale LOCALE = Locale.getDefault();
+    val LOCALE: Locale = Locale.getDefault()
+
     /**
      * The empty title string.
      */
-    public static final String NO_TITLE = "No Title";
+    const val NO_TITLE = "No Title"
+
     /**
      * Properties command line argument.
      */
-    public static final String PROPS_ARG = "properties";
+    const val PROPS_ARG = "properties"
+
     /**
      * The timer delay in minutes.
      */
-    public static final long TIMER_DELAY = 10L;
+    const val TIMER_DELAY = 10L
 
     /**
      * Properties version line argument.
      */
-    public static final String VERSION_ARG = "version";
-
-    /**
-     * Disables the default constructor.
-     */
-    private Constants() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
+    const val VERSION_ARG = "version"
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java b/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
deleted file mode 100644
index 41795f3..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * FeedReader.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot;
-
-import com.rometools.rome.feed.synd.SyndEntry;
-import com.rometools.rome.feed.synd.SyndFeed;
-import com.rometools.rome.io.SyndFeedInput;
-import com.rometools.rome.io.XmlReader;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-/**
- * Reads a RSS feed.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created Feb 1, 2004
- * @since 1.0
- */
-public class FeedReader implements Runnable {
-    // Maximum number of feed items to display
-    private static final int MAX_ITEMS = 5;
-
-    // Bot
-    private final Mobibot bot;
-
-    // Nick of the person who sent the message
-    private final String sender;
-
-    // URL to fetch
-    private final String url;
-
-    /**
-     * Creates a new {@link FeedReader} instance.
-     *
-     * @param bot    The bot's instance.
-     * @param sender The nick of the person who sent the message.
-     * @param url    The URL to fetch.
-     */
-    public FeedReader(final Mobibot bot, final String sender, final String url) {
-        this.bot = bot;
-        this.sender = sender;
-        this.url = url;
-    }
-
-    /**
-     * Fetches the Feed's items.
-     */
-    @Override
-    public final void run() {
-        try {
-            final SyndFeedInput input = new SyndFeedInput();
-            try (final XmlReader reader = new XmlReader(new URL(url))) {
-                final SyndFeed feed = input.build(reader);
-
-                final List<SyndEntry> items = feed.getEntries();
-                if (items.isEmpty()) {
-                    bot.send(sender, "There is currently nothing to view.", false);
-                } else {
-                    SyndEntry item;
-                    for (int i = 0; (i < items.size()) && (i < MAX_ITEMS); i++) {
-                        item = items.get(i);
-                        bot.send(sender, item.getTitle(), false);
-                        bot.send(sender, Utils.helpIndent(Utils.green(item.getLink()), false), false);
-                    }
-                }
-            }
-        } catch (MalformedURLException e) {
-            bot.getLogger().debug("Invalid feed URL.", e);
-            bot.send(sender, "The feed URL is invalid.", false);
-        } catch (Exception e) {
-            bot.getLogger().debug("Unable to fetch the feed.", e);
-            bot.send(sender, "An error has occurred while fetching the feed: " + e.getMessage(), false);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
new file mode 100644
index 0000000..0dcdbac
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
@@ -0,0 +1,85 @@
+/*
+ * FeedReader.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot
+
+import com.rometools.rome.io.SyndFeedInput
+import com.rometools.rome.io.XmlReader
+import java.net.MalformedURLException
+import java.net.URL
+
+/**
+ * Reads a RSS feed.
+ */
+class FeedReader(
+    // Bot
+    private val bot: Mobibot,
+    // Nick of the person who sent the message
+    private val sender: String,
+    // URL to fetch
+    private val url: String
+) : Runnable {
+    /**
+     * Fetches the Feed's items.
+     */
+    override fun run() {
+        with(bot) {
+            try {
+                val input = SyndFeedInput()
+                XmlReader(URL(url)).use { reader ->
+                    val feed = input.build(reader)
+                    val items = feed.entries
+                    if (items.isEmpty()) {
+                        send(sender, "There is currently nothing to view.", false)
+                    } else {
+                        var i = 0
+                        while (i < items.size && i < MAX_ITEMS) {
+                            send(sender, items[i].title, false)
+                            send(sender, Utils.helpIndent(Utils.green(items[i].link), false), false)
+                            i++
+                        }
+                    }
+                }
+            } catch (e: MalformedURLException) {
+                logger.debug("Invalid feed URL.", e)
+                send(sender, "The feed URL is invalid.", false)
+            } catch (e: Exception) {
+                logger.debug("Unable to fetch the feed.", e)
+                send(sender, "An error has occurred while fetching the feed: ${e.message}", false)
+            }
+        }
+    }
+
+    companion object {
+        // Maximum number of feed items to display
+        private const val MAX_ITEMS = 5
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 1289405..63ec7cf 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -579,7 +579,7 @@ public class Mobibot extends PircBot {
      */
     private boolean helpModules(final String sender, final String topic, final boolean isPrivate) {
         for (final AbstractModule module : addons.getModules()) {
-            for (final String cmd : module.getCommands()) {
+            for (final String cmd : module.commands) {
                 if (topic.equals(cmd)) {
                     module.helpResponse(sender, isPrivate);
                     return true;
@@ -646,7 +646,7 @@ public class Mobibot extends PircBot {
      */
     public final void joinChannel() {
         joinChannel(ircChannel);
-        twitter.notification("%1$s %2$s has joined %3$s");
+        twitter.notification(getName() + " " + ReleaseInfo.VERSION + " has joined " + getChannel());
     }
 
     /**
@@ -695,7 +695,7 @@ public class Mobibot extends PircBot {
                 }
                 // Modules
                 for (final AbstractModule module : addons.getModules()) { // modules
-                    for (final String c : module.getCommands()) {
+                    for (final String c : module.commands) {
                         if (cmd.startsWith(c)) {
                             module.commandResponse(sender, cmd, args, false);
                             return;
@@ -739,7 +739,7 @@ public class Mobibot extends PircBot {
         if (cmd.startsWith(Constants.HELP_CMD)) { // help
             helpResponse(sender, args, true);
         } else if (isOp && "kill".equals(cmd)) { // kill
-            twitter.notification("%1$s killed by " + sender + " on %3$s");
+            twitter.notification(getName() + " killed by " + sender + " on " + getChannel());
             sendRawLine("QUIT : Poof!");
             System.exit(0);
         } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) { // debug
@@ -753,7 +753,7 @@ public class Mobibot extends PircBot {
             send(sender + " has just signed my death sentence.");
             TIMER.cancel();
             twitter.shutdown();
-            twitter.notification("%1$s stopped by " + sender + " on %3$s");
+            twitter.notification(getName() + " stopped by " + sender + " on " + getChannel());
             sleep(3);
             quitServer("The Bot Is Out There!");
             System.exit(0);
@@ -766,7 +766,7 @@ public class Mobibot extends PircBot {
             }
             for (final AbstractModule module : addons.getModules()) {
                 if (module.isPrivateMsgEnabled()) {
-                    for (final String c : module.getCommands()) {
+                    for (final String c : module.commands) {
                         if (cmd.equals(c)) {
                             module.commandResponse(sender, cmd, args, true);
                             return;
diff --git a/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java b/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
index 7d807d0..dbc7cb9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
+++ b/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
@@ -69,8 +69,8 @@ public final class TwitterOAuth {
      * @throws TwitterException If an error occurs.
      * @throws IOException      If an IO error occurs.
      */
-    @SuppressFBWarnings({"DM_DEFAULT_ENCODING", "IMC_IMMATURE_CLASS_PRINTSTACKTRACE"})
-    @SuppressWarnings({"PMD.AvoidPrintStackTrace", "PMD.SystemPrintln"})
+    @SuppressFBWarnings({ "DM_DEFAULT_ENCODING", "IMC_IMMATURE_CLASS_PRINTSTACKTRACE" })
+    @SuppressWarnings({ "PMD.AvoidPrintStackTrace", "PMD.SystemPrintln" })
     public static void main(final String[] args) throws TwitterException, IOException {
         if (args.length == 2) {
             final twitter4j.Twitter twitter = new TwitterFactory().getInstance();
@@ -91,9 +91,10 @@ public final class TwitterOAuth {
                         }
 
                         System.out.println(
-                            "Please add the following to the bot's property file:" + "\n\n" + "twitter-consumerKey="
-                            + args[0] + '\n' + "twitter-consumerSecret=" + args[1] + '\n' + "twitter-token="
-                            + accessToken.getToken() + '\n' + "twitter-tokenSecret=" + accessToken.getTokenSecret());
+                                "Please add the following to the bot's property file:" + "\n\n" + "twitter-consumerKey="
+                                + args[0] + '\n' + "twitter-consumerSecret=" + args[1] + '\n' + "twitter-token="
+                                + accessToken.getToken() + '\n' + "twitter-tokenSecret=" + accessToken
+                                                                                                   .getTokenSecret());
                     } catch (TwitterException te) {
                         if (401 == te.getStatusCode()) {
                             System.out.println("Unable to get the access token.");
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.java b/src/main/java/net/thauvin/erik/mobibot/Utils.java
deleted file mode 100644
index 69bd6a9..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Utils.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.apache.commons.lang3.StringUtils;
-import org.jibble.pircbot.Colors;
-import org.jsoup.Jsoup;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-/**
- * Miscellaneous utilities class.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-26
- * @since 1.0
- */
-public final class Utils {
-    private static final String[] searchFlags = { "%c", "%n" };
-
-    /**
-     * Disables the default constructor.
-     *
-     * @throws UnsupportedOperationException If the constructor is called.
-     */
-    private Utils() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
-
-    /**
-     * Makes the given int bold.
-     *
-     * @param i The int.
-     * @return The bold string.
-     */
-    public static String bold(final int i) {
-        return bold(Integer.toString(i));
-    }
-
-    /**
-     * Makes the given string bold.
-     *
-     * @param s The string.
-     * @return The bold string.
-     */
-    public static String bold(final String s) {
-        return colorize(s, Colors.BOLD);
-    }
-
-    /**
-     * Colorize a string.
-     *
-     * @param s     The string.
-     * @param color The color.
-     * @return The colorized string.
-     */
-    static String colorize(final String s, final String color) {
-        if (s == null) {
-            return Colors.NORMAL;
-        } else if (Colors.BOLD.equals(color) || Colors.REVERSE.equals(color)) {
-            return color + s + color;
-        }
-
-        return color + s + Colors.NORMAL;
-    }
-
-    /**
-     * Makes the given string cyan.
-     *
-     * @param s The string.
-     * @return The cyan string.
-     */
-    public static String cyan(final String s) {
-        return colorize(s, Colors.CYAN);
-    }
-
-    /**
-     * URL encodes the given string.
-     *
-     * @param s The string to encode.
-     * @return The encoded string.
-     */
-    public static String encodeUrl(final String s) {
-        return URLEncoder.encode(s, StandardCharsets.UTF_8);
-    }
-
-    /**
-     * Ensures that the given location (File/URL) has a trailing slash (<code>/</code>) to indicate a directory.
-     *
-     * @param location The File or URL location.
-     * @param isUrl    Set to true if the location is a URL
-     * @return The location ending with a slash.
-     */
-    static String ensureDir(final String location, final boolean isUrl) {
-        if (isUrl) {
-            if (location.charAt(location.length() - 1) == '/') {
-                return location;
-            } else {
-                return location + '/';
-            }
-        } else {
-            if (location.charAt(location.length() - 1) == File.separatorChar) {
-                return location;
-            } else {
-                return location + File.separatorChar;
-            }
-        }
-    }
-
-    /**
-     * Returns a property as an int.
-     *
-     * @param property The property value.
-     * @param def      The default property value.
-     * @return The port or default value if invalid.
-     */
-    public static int getIntProperty(final String property, final int def) {
-        int prop;
-
-        try {
-            prop = Integer.parseInt(property);
-        } catch (NumberFormatException ignore) {
-            prop = def;
-        }
-
-        return prop;
-    }
-
-    /**
-     * Makes the given string green.
-     *
-     * @param s The string.
-     * @return The green string.
-     */
-    public static String green(final String s) {
-        return colorize(s, Colors.DARK_GREEN);
-    }
-
-    /**
-     * Formats a help command by replacing {@code %c} with the bot's pub/priv command, and {@code %n} with the bot's
-     * nick.
-     *
-     * @param text      The help command text.
-     * @param botNick   The bot's nick.
-     * @param isPrivate The private flag.
-     * @return The formatted help command.
-     */
-    public static String helpFormat(final String text, final String botNick, final boolean isPrivate) {
-        final String[] replace = { (isPrivate) ? "/msg " + botNick : botNick + ':', botNick };
-        return StringUtils.replaceEach(text, searchFlags, replace);
-    }
-
-    /**
-     * Returns indented help string.
-     *
-     * @param help The help string.
-     * @return The indented help string.
-     * @see #helpIndent(String, boolean)
-     */
-    public static String helpIndent(final String help) {
-        return helpIndent(help, true);
-    }
-
-    /**
-     * Returns indented help string.
-     *
-     * @param help   The help string.
-     * @param isBold The bold flag.
-     * @return The indented help string.
-     */
-    public static String helpIndent(final String help, final boolean isBold) {
-        return "      " + (isBold ? bold(help) : help);
-    }
-
-    /**
-     * Returns the specified date as an ISO local date string.
-     *
-     * @param date The date.
-     * @return The date in {@link DateTimeFormatter#ISO_LOCAL_DATE} format.
-     */
-    public static String isoLocalDate(final Date date) {
-        return isoLocalDate(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()));
-    }
-
-    /**
-     * Returns the specified date as an ISO local date string.
-     *
-     * @param date The date.
-     * @return The date in {@link DateTimeFormatter#ISO_LOCAL_DATE} format.
-     */
-    public static String isoLocalDate(final LocalDateTime date) {
-        return date.format(DateTimeFormatter.ISO_LOCAL_DATE);
-    }
-
-    /**
-     * Obfuscates the given string.
-     *
-     * @param s The string.
-     * @return The obfuscated string.
-     */
-    public static String obfuscate(final String s) {
-        if (StringUtils.isNotBlank(s)) {
-            return StringUtils.repeat('x', s.length());
-        }
-        return s;
-    }
-
-    /**
-     * Returns the plural form of a word, if count &gt; 1.
-     *
-     * @param count  The count.
-     * @param word   The word.
-     * @param plural The plural word.
-     * @return The plural string.
-     */
-    public static String plural(final long count, final String word, final String plural) {
-        if (count > 1) {
-            return plural;
-        } else {
-            return word;
-        }
-    }
-
-    /**
-     * Makes the given string red.
-     *
-     * @param s The string.
-     * @return The red string.
-     */
-    public static String red(final String s) {
-        return colorize(s, Colors.RED);
-    }
-
-    /**
-     * Makes the given string reverse color.
-     *
-     * @param s The string.
-     * @return The reverse color string.
-     */
-    public static String reverseColor(final String s) {
-        return colorize(s, Colors.REVERSE);
-    }
-
-    /**
-     * Returns today's date.
-     *
-     * @return Today's date in {@link DateTimeFormatter#ISO_LOCAL_DATE} format.
-     */
-    public static String today() {
-        return isoLocalDate(LocalDateTime.now());
-    }
-
-    /**
-     * Converts XML/XHTML entities to plain text.
-     *
-     * @param str The string to unescape.
-     * @return The unescaped string.
-     */
-    public static String unescapeXml(final String str) {
-        return Jsoup.parse(str).text();
-    }
-
-    /**
-     * Converts milliseconds to year month week day hour and minutes.
-     *
-     * @param uptime The uptime in milliseconds.
-     * @return The uptime in year month week day hours and minutes.
-     */
-    public static String uptime(final long uptime) {
-        final StringBuilder info = new StringBuilder();
-
-        long days = TimeUnit.MILLISECONDS.toDays(uptime);
-        final long years = days / 365;
-        days %= 365;
-        final long months = days / 30;
-        days %= 30;
-        final long weeks = days / 7;
-        days %= 7;
-        final long hours = TimeUnit.MILLISECONDS.toHours(uptime) - TimeUnit.DAYS.toHours(
-                TimeUnit.MILLISECONDS.toDays(uptime));
-        final long minutes = TimeUnit.MILLISECONDS.toMinutes(uptime) - TimeUnit.HOURS.toMinutes(
-                TimeUnit.MILLISECONDS.toHours(uptime));
-
-        if (years > 0) {
-            info.append(years).append(plural(years, " year ", " years "));
-        }
-
-        if (months > 0) {
-            info.append(weeks).append(plural(months, " month ", " months "));
-        }
-
-        if (weeks > 0) {
-            info.append(weeks).append(plural(weeks, " week ", " weeks "));
-        }
-
-
-        if (days > 0) {
-            info.append(days).append(plural(days, " day ", " days "));
-        }
-
-        if (hours > 0) {
-            info.append(hours).append(plural(hours, " hour ", " hours "));
-        }
-
-        info.append(minutes).append(plural(minutes, " minute", " minutes"));
-
-        return info.toString();
-    }
-
-    /**
-     * Reads contents of a URL.
-     *
-     * @param url The URL to read.
-     * @return The URL contents.
-     * @throws IOException If an IO error occurs.
-     */
-    @SuppressFBWarnings("SECSSSRFUC")
-    public static String urlReader(final URL url) throws IOException {
-        try (final BufferedReader reader = new BufferedReader(
-                new InputStreamReader(url.openStream(), StandardCharsets.UTF_8))) {
-            return reader.lines().collect(Collectors.joining(System.lineSeparator()));
-        }
-    }
-
-    /**
-     * Returns the specified date formatted as <code>yyyy-MM-dd HH:mm</code>.
-     *
-     * @param date The date.
-     * @return The formatted date.
-     */
-    public static String utcDateTime(final Date date) {
-        return utcDateTime(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()));
-    }
-
-    /**
-     * Returns the specified date formatted as <code>yyyy-MM-dd HH:mm</code>.
-     *
-     * @param date The date.
-     * @return The formatted date.
-     */
-    public static String utcDateTime(final LocalDateTime date) {
-        return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
-    }
-
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
new file mode 100644
index 0000000..c1cae4b
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -0,0 +1,301 @@
+/*
+ * Utils.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot
+
+import org.apache.commons.lang3.StringUtils
+import org.jibble.pircbot.Colors
+import org.jsoup.Jsoup
+import java.io.BufferedReader
+import java.io.File
+import java.io.IOException
+import java.io.InputStreamReader
+import java.net.URL
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.util.*
+import java.util.concurrent.TimeUnit
+import java.util.stream.Collectors
+
+/**
+ * Miscellaneous utilities class.
+ */
+class Utils private constructor() {
+    companion object {
+        private val searchFlags = arrayOf("%c", "%n")
+
+        /**
+         * Makes the given int bold.
+         */
+        @JvmStatic
+        fun bold(i: Int): String {
+            return bold(i.toString())
+        }
+
+        /**
+         * Makes the given string bold.
+         */
+        @JvmStatic
+        fun bold(s: String?): String {
+            return colorize(s, Colors.BOLD)
+        }
+
+        /**
+         * Colorize a string.
+         */
+        @JvmStatic
+        fun colorize(s: String?, color: String): String {
+            if (s == null) {
+                return Colors.NORMAL
+            } else if (Colors.BOLD == color || Colors.REVERSE == color) {
+                return color + s + color
+            }
+            return color + s + Colors.NORMAL
+        }
+
+        /**
+         * Makes the given string cyan.
+         */
+        @JvmStatic
+        fun cyan(s: String?): String {
+            return colorize(s, Colors.CYAN)
+        }
+
+        /**
+         * URL encodes the given string.
+         */
+        fun encodeUrl(s: String?): String {
+            return URLEncoder.encode(s, StandardCharsets.UTF_8)
+        }
+
+        /**
+         * Ensures that the given location (File/URL) has a trailing slash (`/`) to indicate a directory.
+         */
+        @JvmStatic
+        fun ensureDir(location: String, isUrl: Boolean): String {
+            return if (location.isNotEmpty()) {
+                if (isUrl) {
+                    if (location[location.length - 1] == '/') {
+                        location
+                    } else {
+                        "$location/"
+                    }
+                } else {
+                    if (location[location.length - 1] == File.separatorChar) {
+                        location
+                    } else {
+                        location + File.separatorChar
+                    }
+                }
+            } else {
+                location
+            }
+        }
+
+        /**
+         * Returns a property as an int.
+         */
+        @JvmStatic
+        fun getIntProperty(property: String, def: Int): Int {
+            return try {
+                property.toInt()
+            } catch (ignore: NumberFormatException) {
+                def
+            }
+        }
+
+        /**
+         * Makes the given string green.
+         */
+        @JvmStatic
+        fun green(s: String?): String {
+            return colorize(s, Colors.DARK_GREEN)
+        }
+
+        /**
+         * Formats a help command by replacing `%c` with the bot's pub/priv command, and `%n` with the bot's
+         * nick.
+         */
+        @JvmStatic
+        fun helpFormat(text: String?, botNick: String, isPrivate: Boolean): String {
+            val replace = arrayOf(if (isPrivate) "/msg $botNick" else "$botNick:", botNick)
+            return StringUtils.replaceEach(text, searchFlags, replace)
+        }
+
+        /**
+         * Returns indented help string.
+         */
+        @JvmStatic
+        @JvmOverloads
+        fun helpIndent(help: String?, isBold: Boolean = true): String {
+            return "      " + if (isBold) bold(help) else help
+        }
+
+        /**
+         * Returns the specified date as an ISO local date string.
+         */
+        @JvmStatic
+        fun isoLocalDate(date: Date): String {
+            return isoLocalDate(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()))
+        }
+
+        /**
+         * Returns the specified date as an ISO local date string.
+         */
+        @JvmStatic
+        fun isoLocalDate(date: LocalDateTime): String {
+            return date.format(DateTimeFormatter.ISO_LOCAL_DATE)
+        }
+
+        /**
+         * Obfuscates the given string.
+         */
+        @JvmStatic
+        fun obfuscate(s: String?): String {
+            return if (s!!.isNotBlank()) {
+                StringUtils.repeat('x', s.length)
+            } else s
+        }
+
+        /**
+         * Returns the plural form of a word, if count &gt; 1.
+         */
+        @JvmStatic
+        fun plural(count: Long, word: String, plural: String): String {
+            return if (count > 1) {
+                plural
+            } else {
+                word
+            }
+        }
+
+        /**
+         * Makes the given string red.
+         */
+        @JvmStatic
+        fun red(s: String?): String {
+            return colorize(s, Colors.RED)
+        }
+
+        /**
+         * Makes the given string reverse color.
+         */
+        @JvmStatic
+        fun reverseColor(s: String?): String {
+            return colorize(s, Colors.REVERSE)
+        }
+
+        /**
+         * Returns today's date.
+         */
+        @JvmStatic
+        fun today(): String {
+            return isoLocalDate(LocalDateTime.now())
+        }
+
+        /**
+         * Converts XML/XHTML entities to plain text.
+         */
+        @JvmStatic
+        fun unescapeXml(str: String?): String {
+            return Jsoup.parse(str).text()
+        }
+
+        /**
+         * Converts milliseconds to year month week day hour and minutes.
+         */
+        @JvmStatic
+        fun uptime(uptime: Long): String {
+            val info = StringBuilder()
+            var days = TimeUnit.MILLISECONDS.toDays(uptime)
+            val years = days / 365
+            days %= 365
+            val months = days / 30
+            days %= 30
+            val weeks = days / 7
+            days %= 7
+            val hours = TimeUnit.MILLISECONDS.toHours(uptime) - TimeUnit.DAYS.toHours(
+                TimeUnit.MILLISECONDS.toDays(uptime)
+            )
+            val minutes = TimeUnit.MILLISECONDS.toMinutes(uptime) - TimeUnit.HOURS.toMinutes(
+                TimeUnit.MILLISECONDS.toHours(uptime)
+            )
+            with(info) {
+                if (years > 0) {
+                    append(years).append(plural(years, " year ", " years "))
+                }
+                if (months > 0) {
+                    append(weeks).append(plural(months, " month ", " months "))
+                }
+                if (weeks > 0) {
+                    append(weeks).append(plural(weeks, " week ", " weeks "))
+                }
+                if (days > 0) {
+                    append(days).append(plural(days, " day ", " days "))
+                }
+                if (hours > 0) {
+                    append(hours).append(plural(hours, " hour ", " hours "))
+                }
+                append(minutes).append(plural(minutes, " minute", " minutes"))
+                return toString()
+            }
+        }
+
+        /**
+         * Reads contents of a URL.
+         */
+        @JvmStatic
+        @Throws(IOException::class)
+        fun urlReader(url: URL): String {
+            BufferedReader(InputStreamReader(url.openStream(), StandardCharsets.UTF_8))
+                .use { reader -> return reader.lines().collect(Collectors.joining(System.lineSeparator())) }
+        }
+
+        /**
+         * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
+         */
+        @JvmStatic
+        fun utcDateTime(date: Date): String {
+            return utcDateTime(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()))
+        }
+
+        /**
+         * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
+         */
+        @JvmStatic
+        fun utcDateTime(date: LocalDateTime): String {
+            return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index df19332..3168dde 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -63,9 +63,10 @@ abstract class AbstractCommand(val bot: Mobibot) {
         return false
     }
 
-    open fun getProperty(key: String) : String? {
+    open fun getProperty(key: String): String? {
         return properties[key]
     }
+
     open fun getPropertyKeys(): Set<String> {
         return properties.keys
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
index dbccdd6..1ca4ed2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -38,10 +38,7 @@ import net.thauvin.erik.mobibot.Utils
 class Cycle(bot: Mobibot) : AbstractCommand(bot) {
     private val wait = 10
     override val name = "cycle"
-    override val help = listOf(
-       "To have the bot leave the channel and come back:",
-        Utils.helpIndent("%c $name")
-    )
+    override val help = listOf("To have the bot leave the channel and come back:", Utils.helpIndent("%c $name"))
     override val isOp = true
     override val isPublic = false
     override val isVisible = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index aed639c..1282d78 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -48,7 +48,7 @@ public class Info extends AbstractCommand {
             + " (" + Utils.green(ReleaseInfo.WEBSITE) + ')',
             "Written by " + ReleaseInfo.AUTHOR + " (" + Utils.green(ReleaseInfo.AUTHOR_URL) + ')');
 
-    public Info(@NotNull final Mobibot bot) {
+    public Info(final Mobibot bot) {
         super(bot);
     }
 
@@ -97,18 +97,14 @@ public class Info extends AbstractCommand {
 
         if (isOp) {
             if (getBot().getTell().isEnabled()) {
-                info.append(", Messages: ")
-                    .append(getBot().getTell().size());
+                info.append(", Messages: ").append(getBot().getTell().size());
             }
             if (getBot().getTwitter().isAutoPost()) {
-                info.append(", Twitter: ")
-                    .append(getBot().getTwitter().entriesCount());
+                info.append(", Twitter: ").append(getBot().getTwitter().entriesCount());
             }
         }
 
-        info.append(", Recap: ")
-            .append(Recap.recapCount())
-            .append(']');
+        info.append(", Recap: ").append(Recap.recapCount()).append(']');
 
         getBot().send(sender, info.toString(), isPrivate);
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index 05efbec..8470320 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -173,7 +173,8 @@ public class Tell extends AbstractCommand {
                        Utils.helpIndent("%c " + TELL_CMD + " <nick> <message>"),
                        "To view queued and sent messages:",
                        Utils.helpIndent("%c " + TELL_CMD + ' ' + View.VIEW_CMD),
-                       "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."));
+                       "Messages are kept for " + Utils.bold(maxDays)
+                       + Utils.plural(maxDays, " day.", " days."));
     }
 
     @Override
@@ -383,8 +384,8 @@ public class Tell extends AbstractCommand {
                                   isPrivate)),
                           isPrivate);
             getBot().send(sender,
-                          "Messages are kept for " + Utils.bold(maxDays) + Utils.plural(maxDays, " day.", " days."),
-                          isPrivate);
+                          "Messages are kept for " + Utils.bold(maxDays)
+                          + Utils.plural(maxDays, " day.", " days."), isPrivate);
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
index f0485db..e114d66 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
@@ -84,7 +84,8 @@ public final class EntriesUtils {
      * @param isView Set to true to display the number of comments.
      * @return The entry's link.
      */
-    @SuppressFBWarnings(value = "CE_CLASS_ENVY", justification = "Yes, it does.")
+    @SuppressFBWarnings(value = "CE_CLASS_ENVY",
+                        justification = "Yes, it does.")
     public static String buildLink(final int index, final EntryLink entry, final boolean isView) {
         final StringBuilder buff = new StringBuilder().append(Constants.LINK_CMD).append(index + 1)
                                                       .append(": ").append('[').append(entry.getNick()).append(']');
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
deleted file mode 100644
index f8483af..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * AbstractModule.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * The <code>Module</code> abstract class.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2016-07-01
- * @since 1.0
- */
-public abstract class AbstractModule {
-    final Mobibot bot;
-    final List<String> commands = new ArrayList<>();
-    final List<String> help = new ArrayList<>();
-    final Map<String, String> properties = new ConcurrentHashMap<>();
-
-    AbstractModule(final Mobibot bot) {
-        this.bot = bot;
-    }
-
-    /**
-     * Responds to a command.
-     *
-     * @param sender    The sender.
-     * @param cmd       The command.
-     * @param args      The command arguments.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    public abstract void commandResponse(final String sender,
-                                         final String cmd,
-                                         final String args,
-                                         final boolean isPrivate);
-
-    /**
-     * Returns the module's commands, if any.
-     *
-     * @return The commands.
-     */
-    public List<String> getCommands() {
-        return commands;
-    }
-
-    /**
-     * Returns the module's property keys.
-     *
-     * @return The keys.
-     */
-    public Set<String> getPropertyKeys() {
-        return properties.keySet();
-    }
-
-    /**
-     * Returns <code>true</code> if the module has properties.
-     *
-     * @return <code>true</code> or <code>false</code> .
-     */
-    public boolean hasProperties() {
-        return !properties.isEmpty();
-    }
-
-    /**
-     * Responds with the module's help.
-     *
-     * @param sender    The sender.
-     * @param isPrivate Set to <code>true</code> if the response should be sent as a private message.
-     */
-    public void helpResponse(final String sender, final boolean isPrivate) {
-        for (final String h : help) {
-            bot.send(sender, Utils.helpFormat(h, bot.getNick(), isPrivateMsgEnabled() && isPrivate), isPrivate);
-        }
-    }
-
-    /**
-     * Initializes the properties.
-     *
-     * @param keys The properties keys to initialize.
-     */
-    public void initProperties(final String... keys) {
-        for (final String key : keys) {
-            properties.put(key, "");
-        }
-    }
-
-    /**
-     * Returns <code>true</code> if the module is enabled.
-     *
-     * @return <code>true</code> or <code>false</code>
-     */
-    public boolean isEnabled() {
-        if (hasProperties()) {
-            return isValidProperties();
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Returns <code>true</code> if the module responds to private messages.
-     *
-     * @return <code>true</code> or <code>false</code>
-     */
-    public boolean isPrivateMsgEnabled() {
-        return false;
-    }
-
-    /**
-     * Ensures that all properties have values.
-     *
-     * @return <code>true</code> if the properties are valid, <code>false</code> otherwise.
-     */
-    boolean isValidProperties() {
-        for (final String s : getPropertyKeys()) {
-            if (StringUtils.isBlank(properties.get(s))) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Sets a property key and value.
-     *
-     * @param key   The key.
-     * @param value The value.
-     */
-    public void setProperty(final String key, final String value) {
-        if (StringUtils.isNotBlank(key)) {
-            properties.put(key, value);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
new file mode 100644
index 0000000..dd40a8c
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -0,0 +1,131 @@
+/*
+ * AbstractModule.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import org.apache.commons.lang3.StringUtils
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+
+/**
+ * The `Module` abstract class.
+ */
+abstract class AbstractModule(val bot: Mobibot) {
+    /**
+     * The module's commands, if any.
+     */
+    @JvmField
+    val commands: MutableList<String> = ArrayList()
+
+    @JvmField
+    val help: MutableList<String> = ArrayList()
+    val properties: MutableMap<String, String> = ConcurrentHashMap()
+
+    /**
+     * Responds to a command.
+     */
+    abstract fun commandResponse(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    )
+
+    /**
+     * Returns the module's property keys.
+     */
+    val propertyKeys: Set<String>
+        get() = properties.keys
+
+    /**
+     * Returns `true` if the module has properties.
+     */
+    fun hasProperties(): Boolean {
+        return properties.isNotEmpty()
+    }
+
+    /**
+     * Responds with the module's help.
+     */
+    open fun helpResponse(sender: String, isPrivate: Boolean) {
+        for (h in help) {
+            bot.send(sender, Utils.helpFormat(h, bot.nick, isPrivateMsgEnabled && isPrivate), isPrivate)
+        }
+    }
+
+    /**
+     * Initializes the properties.
+     */
+    fun initProperties(vararg keys: String) {
+        for (key in keys) {
+            properties[key] = ""
+        }
+    }
+
+    /**
+     * Returns `true` if the module is enabled.
+     */
+    val isEnabled: Boolean
+        get() = if (hasProperties()) {
+            isValidProperties
+        } else {
+            true
+        }
+
+    /**
+     * Returns `true` if the module responds to private messages.
+     */
+    open val isPrivateMsgEnabled: Boolean = false
+
+    /**
+     * Ensures that all properties have values.
+     */
+    open val isValidProperties: Boolean
+        get() {
+            for (s in propertyKeys) {
+                if (StringUtils.isBlank(properties[s])) {
+                    return false
+                }
+            }
+            return true
+        }
+
+    /**
+     * Sets a property key and value.
+     */
+    fun setProperty(key: String, value: String) {
+        if (StringUtils.isNotBlank(key)) {
+            properties[key] = value
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
deleted file mode 100644
index 862711f..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Calc.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import net.objecthunter.exp4j.Expression;
-import net.objecthunter.exp4j.ExpressionBuilder;
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import org.apache.commons.lang3.StringUtils;
-
-import java.text.DecimalFormat;
-
-/**
- * The Calc module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2016-07-01
- * @since 1.0
- */
-public class Calc extends AbstractModule {
-    // Calc command
-    private static final String CALC_CMD = "calc";
-
-    /**
-     * The default constructor.
-     */
-    public Calc(final Mobibot bot) {
-        super(bot);
-
-        commands.add(CALC_CMD);
-
-        help.add("To solve a mathematical calculation:");
-        help.add(Utils.helpIndent("%c " + CALC_CMD + " <calculation>"));
-    }
-
-    /**
-     * Performs a calculation.
-     *
-     * <p>1 + 1 * 2</p>
-     *
-     * @param query The query.
-     * @return The calculation result.
-     */
-    static String calc(final String query) {
-        final DecimalFormat decimalFormat = new DecimalFormat("#.##");
-
-        try {
-            final Expression calc = new ExpressionBuilder(query).build();
-            return query.replace(" ", "") + " = " + Utils.bold(decimalFormat.format(calc.evaluate()));
-        } catch (Exception e) {
-            return "No idea. This is the kind of math I don't get.";
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void commandResponse(final String sender,
-                                final String cmd,
-                                final String args,
-                                final boolean isPrivate) {
-        if (StringUtils.isNotBlank(args)) {
-            bot.send(calc(args));
-        } else {
-            helpResponse(sender, isPrivate);
-        }
-    }
-}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/AbstractModuleTest.java b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
similarity index 54%
rename from src/test/java/net/thauvin/erik/mobibot/modules/AbstractModuleTest.java
rename to src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
index 5eab364..22a6c7e 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/AbstractModuleTest.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -1,5 +1,5 @@
 /*
- * AbstractModuleTest.java
+ * Calc.kt
  *
  * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -29,41 +29,53 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot.modules
 
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import net.objecthunter.exp4j.ExpressionBuilder
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import org.apache.commons.lang3.StringUtils
+import java.text.DecimalFormat
 
 /**
- * The <code>AbstractModuleTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-07
- * @since 1.0
+ * The Calc module.
  */
-
-final class AbstractModuleTest {
-    private AbstractModuleTest() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
+class Calc(bot: Mobibot) : AbstractModule(bot) {
+    override fun commandResponse(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    ) {
+        if (StringUtils.isNotBlank(args)) {
+            bot.send(calc(args))
+        } else {
+            helpResponse(sender, isPrivate)
+        }
     }
 
-    @SuppressFBWarnings("CE_CLASS_ENVY")
-    static void testAbstractModule(final AbstractModule module) {
-        final String name = module.getClass().getName();
+    companion object {
+        // Calc command
+        private const val CALC_CMD = "calc"
 
-        assertThat(module.isEnabled()).as(name + ": enabled").isNotEqualTo(module.hasProperties());
-        assertThat(module.getCommands().size()).as(name + ": commands > 0").isGreaterThan(0);
-        if (!module.hasProperties()) {
-            assertThat(module.getPropertyKeys().size()).as(name + ": no properties").isEqualTo(0);
-            module.setProperty("test", "test");
-            module.setProperty("", "invalid");
+        /**
+         * Performs a calculation. e.g.: 1 + 1 * 2
+         */
+        @JvmStatic
+        fun calc(query: String): String {
+            val decimalFormat = DecimalFormat("#.##")
+            return try {
+                val calc = ExpressionBuilder(query).build()
+                query.replace(" ", "") + " = " + Utils.bold(decimalFormat.format(calc.evaluate()))
+            } catch (e: IllegalArgumentException) {
+                "No idea. This is the kind of math I don't get."
+            }
         }
+    }
 
-        assertThat(module.getPropertyKeys().size()).as(name + ": properties > 0").isGreaterThan(0);
-
-        module.setProperty("invalid", "");
-        assertThat(module.isValidProperties()).as(name + ": invalid properties").isFalse();
+    init {
+        commands.add(CALC_CMD)
+        help.add("To solve a mathematical calculation:")
+        help.add(Utils.helpIndent("%c $CALC_CMD <calculation>"))
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
deleted file mode 100644
index 2794395..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * CurrencyConverter.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Constants;
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.msg.ErrorMessage;
-import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.msg.PublicMessage;
-import org.apache.commons.lang3.StringUtils;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.JDOMException;
-import org.jdom2.Namespace;
-import org.jdom2.input.SAXBuilder;
-
-import javax.xml.XMLConstants;
-import java.io.IOException;
-import java.net.URL;
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import static org.apache.commons.lang3.StringUtils.upperCase;
-
-/**
- * The CurrentConverter module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created Feb 11, 2004
- * @since 1.0
- */
-@SuppressWarnings("PMD.UseConcurrentHashMap")
-public final class CurrencyConverter extends ThreadedModule {
-    // Currency command
-    private static final String CURRENCY_CMD = "currency";
-    // Rates keyword
-    private static final String CURRENCY_RATES_KEYWORD = "rates";
-    // Empty rate table.
-    private static final String EMPTY_RATE_TABLE = "Sorry, but the exchange rate table is empty.";
-    // Exchange rates
-    private static final Map<String, String> EXCHANGE_RATES = new TreeMap<>();
-    // Exchange rates table URL
-    private static final String EXCHANGE_TABLE_URL = "https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml";
-    // Last exchange rates table publication date
-    private static String pubDate = "";
-
-    /**
-     * Creates a new {@link CurrencyConverter} instance.
-     */
-    public CurrencyConverter(final Mobibot bot) {
-        super(bot);
-
-        commands.add(CURRENCY_CMD);
-    }
-
-    /**
-     * Converts from a currency to another.
-     *
-     * <p>100 USD to EUR</p>
-     *
-     * @param query The query.
-     * @return The {@link Message} contained the converted currency.
-     */
-    static Message convertCurrency(final String query) {
-        final String[] cmds = query.split(" ");
-
-        if (cmds.length == 4) {
-            if (cmds[3].equals(cmds[1]) || "0".equals(cmds[0])) {
-                return new PublicMessage("You're kidding, right?");
-            } else {
-                final String to = upperCase(cmds[1]);
-                final String from = upperCase(cmds[3]);
-
-                if (EXCHANGE_RATES.containsKey(to) && EXCHANGE_RATES.containsKey(from)) {
-                    try {
-                        final double amt = Double.parseDouble(cmds[0].replace(",", ""));
-                        final double doubleFrom = Double.parseDouble(EXCHANGE_RATES.get(to));
-                        final double doubleTo = Double.parseDouble(EXCHANGE_RATES.get(from));
-
-                        return new PublicMessage(
-                                NumberFormat.getCurrencyInstance(Constants.LOCALE).format(amt).substring(1)
-                                + ' '
-                                + upperCase(cmds[1])
-                                + " = "
-                                + NumberFormat.getCurrencyInstance(Constants.LOCALE)
-                                              .format((amt * doubleTo) / doubleFrom)
-                                              .substring(1)
-                                + ' '
-                                + upperCase(cmds[3]));
-                    } catch (NumberFormatException e) {
-                        return new ErrorMessage("Let's try with some real numbers next time, okay?");
-                    }
-                } else {
-                    return new ErrorMessage("Sounds like monopoly money to me!");
-                }
-            }
-        }
-        return new ErrorMessage("Invalid query. Let's try again.");
-    }
-
-    static List<String> currencyRates() {
-        final List<String> rates = new ArrayList<>(33);
-        for (final Map.Entry<String, String> rate : EXCHANGE_RATES.entrySet()) {
-            rates.add("  " + rate.getKey() + ": " + StringUtils.leftPad(rate.getValue(), 8));
-        }
-
-        return rates;
-    }
-
-    static void loadRates() throws ModuleException {
-        if (EXCHANGE_RATES.isEmpty()) {
-            try {
-                final SAXBuilder builder = new SAXBuilder();
-                // See https://rules.sonarsourcecom/java/tag/owasp/RSPEC-2755
-                builder.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
-                builder.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "");
-                builder.setIgnoringElementContentWhitespace(true);
-
-                final Document doc = builder.build(new URL(EXCHANGE_TABLE_URL));
-                final Element root = doc.getRootElement();
-                final Namespace ns = root.getNamespace("");
-                final Element cubeRoot = root.getChild("Cube", ns);
-                final Element cubeTime = cubeRoot.getChild("Cube", ns);
-
-                pubDate = cubeTime.getAttribute("time").getValue();
-
-                final List<Element> cubes = cubeTime.getChildren();
-
-                for (final Element cube : cubes) {
-                    EXCHANGE_RATES.put(
-                            cube.getAttribute("currency").getValue(),
-                            cube.getAttribute("rate").getValue());
-                }
-
-                EXCHANGE_RATES.put("EUR", "1");
-            } catch (JDOMException | IOException e) {
-                throw new ModuleException(e.getMessage(),
-                                          "An error has occurred while parsing the exchange rates table.",
-                                          e);
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void commandResponse(final String sender,
-                                final String cmd,
-                                final String args,
-                                final boolean isPrivate) {
-        synchronized (this) {
-            if (!pubDate.equals(Utils.today())) {
-                EXCHANGE_RATES.clear();
-            }
-        }
-
-        super.commandResponse(sender, cmd, args, isPrivate);
-    }
-
-    /**
-     * Converts the specified currencies.
-     */
-    @SuppressFBWarnings("REDOS")
-    @Override
-    void run(final String sender, final String cmd, final String query, final boolean isPrivate) {
-        if (EXCHANGE_RATES.isEmpty()) {
-            try {
-                loadRates();
-            } catch (ModuleException e) {
-                bot.getLogger().warn(e.getDebugMessage(), e);
-            }
-        }
-
-        if (EXCHANGE_RATES.isEmpty()) {
-            bot.send(sender, EMPTY_RATE_TABLE, true);
-        } else if (query.matches("\\d+([,\\d]+)?(\\.\\d+)? [a-zA-Z]{3}+ to [a-zA-Z]{3}+")) {
-            final Message msg = convertCurrency(query);
-            bot.send(sender, msg);
-            if (msg.isError()) {
-                helpResponse(sender, isPrivate);
-            }
-        } else if (query.contains(CURRENCY_RATES_KEYWORD)) {
-            bot.send(sender, "The currency rates for " + Utils.bold(pubDate) + " are:", isPrivate);
-            bot.sendList(sender, currencyRates(), 3, isPrivate, false);
-        } else {
-            helpResponse(sender, isPrivate);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void helpResponse(final String sender, final boolean isPrivate) {
-        if (EXCHANGE_RATES.isEmpty()) {
-            try {
-                loadRates();
-            } catch (ModuleException e) {
-                bot.getLogger().debug(e.getDebugMessage(), e);
-            }
-        }
-        if (EXCHANGE_RATES.isEmpty()) {
-            bot.send(sender, EMPTY_RATE_TABLE, isPrivate);
-        } else {
-            bot.send(sender, "To convert from one currency to another:", isPrivate);
-            bot.send(sender,
-                     Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + " 100 USD to EUR",
-                                                       bot.getNick(), isPrivateMsgEnabled())), isPrivate);
-            bot.send(sender, "For a listing of current rates:", isPrivate);
-            bot.send(sender,
-                     Utils.helpIndent(Utils.helpFormat("%c " + CURRENCY_CMD + ' ' + CURRENCY_RATES_KEYWORD,
-                                                       bot.getNick(), isPrivateMsgEnabled())), isPrivate);
-            bot.send(sender, "The supported currencies are: ", isPrivate);
-            bot.sendList(sender, new ArrayList<>(EXCHANGE_RATES.keySet()), 11, isPrivate, false);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
new file mode 100644
index 0000000..c72e73d
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -0,0 +1,234 @@
+/*
+ * CurrencyConverter.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.msg.ErrorMessage
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.PublicMessage
+import org.apache.commons.lang3.StringUtils
+import org.jdom2.JDOMException
+import org.jdom2.input.SAXBuilder
+import java.io.IOException
+import java.net.URL
+import java.text.NumberFormat
+import java.util.*
+import javax.xml.XMLConstants
+
+/**
+ * The CurrentConverter module.
+ */
+class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
+    override fun commandResponse(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    ) {
+        synchronized(this) {
+            if (pubDate != Utils.today()) {
+                EXCHANGE_RATES.clear()
+            }
+        }
+        super.commandResponse(sender, cmd, args, isPrivate)
+    }
+
+    /**
+     * Converts the specified currencies.
+     */
+    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+        with(bot) {
+            if (EXCHANGE_RATES.isEmpty()) {
+                try {
+                    loadRates()
+                } catch (e: ModuleException) {
+                    logger.warn(e.debugMessage, e)
+                }
+            }
+
+            if (EXCHANGE_RATES.isEmpty()) {
+                send(sender, EMPTY_RATE_TABLE, true)
+            } else if (args.matches("\\d+([,\\d]+)?(\\.\\d+)? [a-zA-Z]{3}+ to [a-zA-Z]{3}+".toRegex())) {
+                val msg = convertCurrency(args)
+                send(sender, msg)
+                if (msg.isError) {
+                    helpResponse(sender, isPrivate)
+                }
+            } else if (args.contains(CURRENCY_RATES_KEYWORD)) {
+                send(sender, "The currency rates for ${Utils.bold(pubDate)} are:", isPrivate)
+                sendList(sender, currencyRates(), 3, isPrivate, false)
+            } else {
+                helpResponse(sender, isPrivate)
+            }
+        }
+    }
+
+    override fun helpResponse(sender: String, isPrivate: Boolean) {
+        with(bot) {
+            if (EXCHANGE_RATES.isEmpty()) {
+                try {
+                    loadRates()
+                } catch (e: ModuleException) {
+                    logger.debug(e.debugMessage, e)
+                }
+            }
+            if (EXCHANGE_RATES.isEmpty()) {
+                send(sender, EMPTY_RATE_TABLE, isPrivate)
+            } else {
+                send(sender, "To convert from one currency to another:", isPrivate)
+                send(
+                    sender,
+                    Utils.helpIndent(
+                        Utils.helpFormat("%c $CURRENCY_CMD 100 USD to EUR", nick, isPrivateMsgEnabled)
+                    ),
+                    isPrivate
+                )
+                send(sender, "For a listing of current rates:", isPrivate)
+                send(
+                    sender,
+                    Utils.helpIndent(
+                        Utils.helpFormat("%c $CURRENCY_CMD $CURRENCY_RATES_KEYWORD", nick, isPrivateMsgEnabled)
+                    ),
+                    isPrivate
+                )
+                send(sender, "The supported currencies are: ", isPrivate)
+                sendList(sender, ArrayList(EXCHANGE_RATES.keys), 11, isPrivate, false)
+            }
+        }
+    }
+
+    companion object {
+        // Currency command
+        private const val CURRENCY_CMD = "currency"
+
+        // Rates keyword
+        private const val CURRENCY_RATES_KEYWORD = "rates"
+
+        // Empty rate table.
+        private const val EMPTY_RATE_TABLE = "Sorry, but the exchange rate table is empty."
+
+        // Exchange rates
+        private val EXCHANGE_RATES: MutableMap<String, String> = TreeMap()
+
+        // Exchange rates table URL
+        private const val EXCHANGE_TABLE_URL = "https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml"
+
+        // Last exchange rates table publication date
+        private var pubDate = ""
+
+        /**
+         * Converts from a currency to another.
+         */
+        @JvmStatic
+        fun convertCurrency(query: String): Message {
+            val cmds = query.split(" ").toTypedArray()
+            return if (cmds.size == 4) {
+                if (cmds[3] == cmds[1] || "0" == cmds[0]) {
+                    PublicMessage("You're kidding, right?")
+                } else {
+                    val to = StringUtils.upperCase(cmds[1])
+                    val from = StringUtils.upperCase(cmds[3])
+                    if (EXCHANGE_RATES.containsKey(to) && EXCHANGE_RATES.containsKey(from)) {
+                        try {
+                            val amt = cmds[0].replace(",", "").toDouble()
+                            val doubleFrom = EXCHANGE_RATES[to]!!.toDouble()
+                            val doubleTo = EXCHANGE_RATES[from]!!.toDouble()
+                            PublicMessage(
+                                NumberFormat.getCurrencyInstance(Constants.LOCALE).format(amt).substring(1)
+                                    + " ${StringUtils.upperCase(cmds[1])} = "
+                                    + NumberFormat.getCurrencyInstance(Constants.LOCALE)
+                                    .format(amt * doubleTo / doubleFrom).substring(1)
+                                    + " ${StringUtils.upperCase(cmds[3])}"
+                            )
+                        } catch (e: NumberFormatException) {
+                            ErrorMessage("Let's try with some real numbers next time, okay?")
+                        }
+                    } else {
+                        ErrorMessage("Sounds like monopoly money to me!")
+                    }
+                }
+            } else ErrorMessage("Invalid query. Let's try again.")
+        }
+
+        @JvmStatic
+        fun currencyRates(): List<String> {
+            val rates = ArrayList<String>(33)
+            for ((key, value) in EXCHANGE_RATES) {
+                rates.add("  $key: ${StringUtils.leftPad(value, 8)}")
+            }
+            return rates
+        }
+
+        @JvmStatic
+        @Throws(ModuleException::class)
+        fun loadRates() {
+            if (EXCHANGE_RATES.isEmpty()) {
+                try {
+                    val builder = SAXBuilder()
+                    // See https://rules.sonarsourcecom/java/tag/owasp/RSPEC-2755
+                    builder.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "")
+                    builder.setProperty(XMLConstants.ACCESS_EXTERNAL_SCHEMA, "")
+                    builder.ignoringElementContentWhitespace = true
+                    val doc = builder.build(URL(EXCHANGE_TABLE_URL))
+                    val root = doc.rootElement
+                    val ns = root.getNamespace("")
+                    val cubeRoot = root.getChild("Cube", ns)
+                    val cubeTime = cubeRoot.getChild("Cube", ns)
+                    pubDate = cubeTime.getAttribute("time").value
+                    val cubes = cubeTime.children
+                    for (cube in cubes) {
+                        EXCHANGE_RATES[cube.getAttribute("currency").value] = cube.getAttribute("rate").value
+                    }
+                    EXCHANGE_RATES["EUR"] = "1"
+                } catch (e: JDOMException) {
+                    throw ModuleException(
+                        e.message,
+                        "An JDOM parsing error has occurred while parsing the exchange rates table.",
+                        e
+                    )
+                } catch (e: IOException) {
+                    throw ModuleException(
+                        e.message,
+                        "An IO error has occurred while parsing the exchange rates table.",
+                        e
+                    )
+                }
+            }
+        }
+    }
+
+    init {
+        commands.add(CURRENCY_CMD)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
deleted file mode 100644
index 861a244..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Dice.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-
-import java.security.SecureRandom;
-
-import static net.thauvin.erik.mobibot.Utils.bold;
-
-/**
- * The Dice module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-28
- * @since 1.0
- */
-public final class Dice extends AbstractModule {
-    // Dice command
-    private static final String DICE_CMD = "dice";
-
-    /**
-     * The default constructor.
-     */
-    public Dice(final Mobibot bot) {
-        super(bot);
-
-        commands.add(DICE_CMD);
-
-        help.add("To roll the dice:");
-        help.add(Utils.helpIndent("%c " + DICE_CMD));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void commandResponse(final String sender,
-                                final String cmd,
-                                final String args,
-                                final boolean isPrivate) {
-        final SecureRandom r = new SecureRandom();
-
-        int i = r.nextInt(6) + 1;
-        int y = r.nextInt(6) + 1;
-        final int playerTotal = i + y;
-
-        bot.send(bot.getChannel(),
-                 sender + " rolled two dice: " + bold(i) + " and " + bold(y) + " for a total of "
-                 + bold(playerTotal), isPrivate);
-
-        i = r.nextInt(6) + 1;
-        y = r.nextInt(6) + 1;
-        final int total = i + y;
-
-        bot.action(
-                "rolled two dice: " + bold(i) + " and " + bold(y) + " for a total of " + bold(total));
-
-        if (playerTotal < total) {
-            bot.action("wins.");
-        } else if (playerTotal > total) {
-            bot.action("lost.");
-        } else {
-            bot.action("tied.");
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
new file mode 100644
index 0000000..4f6a314
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -0,0 +1,103 @@
+/*
+ * Dice.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import kotlin.random.Random
+
+/**
+ * The Dice module.
+ */
+class Dice(bot: Mobibot) : AbstractModule(bot) {
+    override fun commandResponse(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    ) {
+        val roll = roll()
+        val playerRoll = roll()
+        val total = roll.first + roll.second
+        val playerTotal = playerRoll.first + playerRoll.second
+        with(bot) {
+            send(
+                channel,
+                "$sender rolled two dice: ${Utils.bold(playerRoll.first)} and ${Utils.bold(playerRoll.second)}"
+                    + " for a total of ${Utils.bold(playerTotal)}",
+                isPrivate
+            )
+            action(
+                "rolled two dice: ${Utils.bold(roll.first)} and ${Utils.bold(roll.second)}" +
+                    " for a total of ${Utils.bold(total)}"
+            )
+            when (winLoseOrTie(total, playerTotal)) {
+                Result.WIN -> action("wins.")
+                Result.LOSE -> action("lost.")
+                else -> action("tied.")
+            }
+        }
+    }
+
+    enum class Result {
+        WIN, LOSE, TIE
+    }
+
+    private fun roll(): Pair<Int, Int> {
+        return Pair(Random.nextInt(1, 7), Random.nextInt(1, 7))
+    }
+
+    companion object {
+        // Dice command
+        private const val DICE_CMD = "dice"
+
+        fun winLoseOrTie(bot: Int, player: Int): Result {
+            return when {
+                bot > player -> {
+                    Result.WIN
+                }
+                bot < player -> {
+                    Result.LOSE
+                }
+                else -> {
+                    Result.TIE
+                }
+            }
+        }
+    }
+
+    init {
+        commands.add(DICE_CMD)
+        help.add("To roll the dice:")
+        help.add(Utils.helpIndent("%c $DICE_CMD"))
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
deleted file mode 100644
index 478a64e..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * GoogleSearch.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.msg.NoticeMessage;
-import org.apache.commons.lang3.StringUtils;
-import org.jibble.pircbot.Colors;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The GoogleSearch module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created Feb 7, 2004
- * @since 1.0
- */
-public final class GoogleSearch extends ThreadedModule {
-    // Google API Key property
-    static final String GOOGLE_API_KEY_PROP = "google-api-key";
-    // Google Custom Search Engine ID property
-    static final String GOOGLE_CSE_KEY_PROP = "google-cse-cx";
-    // Google command
-    private static final String GOOGLE_CMD = "google";
-
-    /**
-     * Creates a new {@link GoogleSearch} instance.
-     */
-    public GoogleSearch(final Mobibot bot) {
-        super(bot);
-
-        commands.add(GOOGLE_CMD);
-
-        help.add("To search Google:");
-        help.add(Utils.helpIndent("%c " + GOOGLE_CMD + " <query>"));
-
-        initProperties(GOOGLE_API_KEY_PROP, GOOGLE_CSE_KEY_PROP);
-    }
-
-    /**
-     * Performs a search on Google.
-     *
-     * @param query  The search query.
-     * @param apiKey The Google API key.
-     * @param cseKey The Google CSE key.
-     * @return The {@link Message} array containing the search results.
-     * @throws ModuleException If an error occurs while searching.
-     */
-    @SuppressFBWarnings({ "URLCONNECTION_SSRF_FD", "REC_CATCH_EXCEPTION" })
-    @SuppressWarnings(("PMD.AvoidInstantiatingObjectsInLoops"))
-    static List<Message> searchGoogle(final String query, final String apiKey, final String cseKey)
-            throws ModuleException {
-        if (StringUtils.isBlank(apiKey) || StringUtils.isBlank(cseKey)) {
-            throw new ModuleException(StringUtils.capitalize(GOOGLE_CMD) + " is disabled. The API keys are missing.");
-        }
-
-        if (StringUtils.isNotBlank(query)) {
-            final ArrayList<Message> results = new ArrayList<>();
-            try {
-                final URL url =
-                        new URL("https://www.googleapis.com/customsearch/v1?key="
-                                + apiKey
-                                + "&cx="
-                                + cseKey
-                                + "&q="
-                                + Utils.encodeUrl(query)
-                                + "&filter=1&num=5&alt=json");
-
-                final JSONObject json = new JSONObject(Utils.urlReader(url));
-                final JSONArray ja = json.getJSONArray("items");
-
-                for (int i = 0; i < ja.length(); i++) {
-                    final JSONObject j = ja.getJSONObject(i);
-                    results.add(new NoticeMessage(Utils.unescapeXml(j.getString("title"))));
-                    results.add(
-                            new NoticeMessage(Utils.helpIndent(j.getString("link"), false), Colors.DARK_GREEN));
-                }
-            } catch (IOException e) {
-                throw new ModuleException("searchGoogle(" + query + ')', "An error has occurred searching Google.", e);
-            }
-
-            return results;
-        } else {
-            throw new ModuleException("Invalid query. Please try again.");
-        }
-    }
-
-    /**
-     * Searches Google.
-     */
-    @Override
-    void run(final String sender, final String cmd, final String query, final boolean isPrivate) {
-        if (StringUtils.isNotBlank(query)) {
-            try {
-                final List<Message> results = searchGoogle(query, properties.get(GOOGLE_API_KEY_PROP),
-                                                           properties.get(GOOGLE_CSE_KEY_PROP));
-                for (final Message msg : results) {
-                    bot.send(sender, msg);
-                }
-            } catch (ModuleException e) {
-                bot.getLogger().warn(e.getDebugMessage(), e);
-                bot.send(sender, e.getMessage(), isPrivate);
-            }
-        } else {
-            helpResponse(sender, isPrivate);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
new file mode 100644
index 0000000..b05a0cb
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -0,0 +1,125 @@
+/*
+ * GoogleSearch.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.NoticeMessage
+import org.apache.commons.lang3.StringUtils
+import org.jibble.pircbot.Colors
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.IOException
+import java.net.URL
+import java.util.*
+
+/**
+ * The GoogleSearch module.
+ */
+class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
+    /**
+     * Searches Google.
+     */
+    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+        with(bot) {
+            if (StringUtils.isNotBlank(args)) {
+                try {
+                    val results = searchGoogle(
+                        args, properties[GOOGLE_API_KEY_PROP],
+                        properties[GOOGLE_CSE_KEY_PROP]
+                    )
+                    for (msg in results) {
+                        send(sender, msg)
+                    }
+                } catch (e: ModuleException) {
+                    logger.warn(e.debugMessage, e)
+                    send(sender, e.message, isPrivate)
+                }
+            } else {
+                helpResponse(sender, isPrivate)
+            }
+        }
+    }
+
+    companion object {
+        // Google API Key property
+        const val GOOGLE_API_KEY_PROP = "google-api-key"
+
+        // Google Custom Search Engine ID property
+        const val GOOGLE_CSE_KEY_PROP = "google-cse-cx"
+
+        // Google command
+        private const val GOOGLE_CMD = "google"
+
+        /**
+         * Performs a search on Google.
+         */
+        @JvmStatic
+        @Throws(ModuleException::class)
+        fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List<Message> {
+            if (StringUtils.isBlank(apiKey) || StringUtils.isBlank(cseKey)) {
+                throw ModuleException("${StringUtils.capitalize(GOOGLE_CMD)} is disabled. The API keys are missing.")
+            }
+            return if (StringUtils.isNotBlank(query)) {
+                val results = ArrayList<Message>()
+                try {
+                    val url = URL(
+                        "https://www.googleapis.com/customsearch/v1?key=$apiKey&cx=$cseKey" +
+                            "&q=${Utils.encodeUrl(query)}&filter=1&num=5&alt=json"
+                    )
+                    val json = JSONObject(Utils.urlReader(url))
+                    val ja = json.getJSONArray("items")
+                    for (i in 0 until ja.length()) {
+                        val j = ja.getJSONObject(i)
+                        results.add(NoticeMessage(Utils.unescapeXml(j.getString("title"))))
+                        results.add(NoticeMessage(Utils.helpIndent(j.getString("link"), false), Colors.DARK_GREEN))
+                    }
+                } catch (e: IOException) {
+                    throw ModuleException("searchGoogle($query)", "An IO error has occurred searching Google.", e)
+                } catch (e: JSONException) {
+                    throw ModuleException("searchGoogle($query)", "A JSON error has occurred searching Google.", e)
+                }
+                results
+            } else {
+                throw ModuleException("Invalid query. Please try again.")
+            }
+        }
+    }
+
+    init {
+        commands.add(GOOGLE_CMD)
+        help.add("To search Google:")
+        help.add(Utils.helpIndent("%c $GOOGLE_CMD <query>"))
+        initProperties(GOOGLE_API_KEY_PROP, GOOGLE_CSE_KEY_PROP)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
deleted file mode 100644
index 23ed888..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Joke.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.msg.PublicMessage;
-import org.json.JSONObject;
-
-import java.net.URL;
-
-/**
- * The Joke module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-20
- * @since 1.0
- */
-public final class Joke extends ThreadedModule {
-    // Joke command
-    private static final String JOKE_CMD = "joke";
-    // ICNDB URL
-    private static final String JOKE_URL =
-            "http://api.icndb.com/jokes/random?escape=javascript&exclude=[explicit]&limitTo=[nerdy]";
-
-    /**
-     * Creates a new {@link Joke} instance.
-     */
-    public Joke(final Mobibot bot) {
-        super(bot);
-
-        commands.add(JOKE_CMD);
-
-        help.add("To retrieve a random joke:");
-        help.add(Utils.helpIndent("%c " + JOKE_CMD));
-    }
-
-    /**
-     * Retrieves a random joke.
-     *
-     * @return The {@link Message} containing the new joke.
-     * @throws ModuleException If an error occurs while retrieving a new joke.
-     */
-    static Message randomJoke() throws ModuleException {
-        try {
-            final URL url = new URL(JOKE_URL);
-            final JSONObject json = new JSONObject(Utils.urlReader(url));
-            return new PublicMessage(
-                    json.getJSONObject("value").get("joke").toString().replace("\\'", "'")
-                        .replace("\\\"", "\""));
-        } catch (Exception e) {
-            throw new ModuleException("randomJoke()", "An error has occurred retrieving a random joke.", e);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void commandResponse(final String sender,
-                                final String cmd,
-                                final String args,
-                                final boolean isPrivate) {
-        new Thread(() -> run(sender, cmd, args, isPrivate)).start();
-    }
-
-    /**
-     * Returns a random joke from <a href="http://www.icndb.com/">The Internet Chuck Norris Database</a>.
-     */
-    @Override
-    void run(final String sender, final String cmd, final String arg, final boolean isPrivate) {
-        try {
-            bot.send(Utils.cyan(randomJoke().getMsg()));
-        } catch (ModuleException e) {
-            bot.getLogger().warn(e.getDebugMessage(), e);
-            bot.send(sender, e.getMessage(), isPrivate);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
new file mode 100644
index 0000000..722ab75
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -0,0 +1,100 @@
+/*
+ * Joke.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.PublicMessage
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.IOException
+import java.net.URL
+
+/**
+ * The Joke module.
+ */
+class Joke(bot: Mobibot) : ThreadedModule(bot) {
+    override fun commandResponse(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    ) {
+        Thread { run(sender, cmd, args, isPrivate) }.start()
+    }
+
+    /**
+     * Returns a random joke from [The Internet Chuck Norris Database](http://www.icndb.com/).
+     */
+    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) = try {
+        bot.send(Utils.cyan(randomJoke().msg))
+    } catch (e: ModuleException) {
+        bot.logger.warn(e.debugMessage, e)
+        bot.send(sender, e.message, isPrivate)
+    }
+
+    companion object {
+        // Joke command
+        private const val JOKE_CMD = "joke"
+
+        // ICNDB URL
+        private const val JOKE_URL =
+            "http://api.icndb.com/jokes/random?escape=javascript&exclude=[explicit]&limitTo=[nerdy]"
+
+        /**
+         * Retrieves a random joke.
+         */
+        @JvmStatic
+        @Throws(ModuleException::class)
+        fun randomJoke(): Message {
+            return try {
+                val url = URL(JOKE_URL)
+                val json = JSONObject(Utils.urlReader(url))
+                PublicMessage(
+                    json.getJSONObject("value")["joke"].toString().replace("\\'", "'")
+                        .replace("\\\"", "\"")
+                )
+            } catch (e: IOException) {
+                throw ModuleException("randomJoke()", "An IO error has occurred retrieving a random joke.", e)
+            } catch (e: JSONException) {
+                throw ModuleException("randomJoke()", "An JSON error has occurred retrieving a random joke.", e)
+            }
+        }
+    }
+
+    init {
+        commands.add(JOKE_CMD)
+        help.add("To retrieve a random joke:")
+        help.add(Utils.helpIndent("%c $JOKE_CMD"))
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
deleted file mode 100644
index f97284d..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Lookup.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import net.thauvin.erik.mobibot.Constants;
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import org.apache.commons.net.whois.WhoisClient;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- * The Lookup module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-26
- * @since 1.0
- */
-public final class Lookup extends AbstractModule {
-    /**
-     * The whois default host.
-     */
-    static final String WHOIS_HOST = "whois.arin.net";
-
-    // Lookup command
-    private static final String LOOKUP_CMD = "lookup";
-
-    /**
-     * The default constructor.
-     */
-    public Lookup(final Mobibot bot) {
-        super(bot);
-
-        commands.add(LOOKUP_CMD);
-
-        help.add("To perform a DNS lookup query:");
-        help.add(Utils.helpIndent("%c " + LOOKUP_CMD + " <ip address or hostname>"));
-    }
-
-    /**
-     * Performs a DNS lookup on the specified query.
-     *
-     * @param query The IP address or hostname.
-     * @return The lookup query result string.
-     * @throws java.net.UnknownHostException If the host is unknown.
-     */
-    public static String lookup(final String query)
-            throws UnknownHostException {
-        final StringBuilder buffer = new StringBuilder();
-
-        final InetAddress[] results = InetAddress.getAllByName(query);
-        String hostInfo;
-
-        for (final InetAddress result : results) {
-            if (result.getHostAddress().equals(query)) {
-                hostInfo = result.getHostName();
-
-                if (hostInfo.equals(query)) {
-                    throw new UnknownHostException();
-                }
-            } else {
-                hostInfo = result.getHostAddress();
-            }
-
-            if (buffer.length() > 0) {
-                buffer.append(", ");
-            }
-
-            buffer.append(hostInfo);
-        }
-
-        return buffer.toString();
-    }
-
-    /**
-     * Performs a whois IP query.
-     *
-     * @param query The IP address.
-     * @return The IP whois data, if any.
-     * @throws java.io.IOException If a connection error occurs.
-     */
-    private static String[] whois(final String query)
-            throws IOException {
-        return whois(query, WHOIS_HOST);
-    }
-
-    /**
-     * Performs a whois IP query.
-     *
-     * @param query The IP address.
-     * @param host  The whois host.
-     * @return The IP whois data, if any.
-     * @throws java.io.IOException If a connection error occurs.
-     */
-    public static String[] whois(final String query, final String host)
-            throws IOException {
-        final WhoisClient whoisClient = new WhoisClient();
-        final String[] lines;
-
-        try {
-            whoisClient.setDefaultTimeout(Constants.CONNECT_TIMEOUT);
-            whoisClient.connect(host);
-            whoisClient.setSoTimeout(Constants.CONNECT_TIMEOUT);
-            whoisClient.setSoLinger(false, 0);
-
-            if (WHOIS_HOST.equals(host)) {
-                lines = whoisClient.query("n - " + query).split("\n");
-            } else {
-                lines = whoisClient.query(query).split("\n");
-            }
-        } finally {
-            whoisClient.disconnect();
-        }
-
-        return lines;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void commandResponse(final String sender,
-                                final String cmd,
-                                final String args,
-                                final boolean isPrivate) {
-        if (args.matches("(\\S.)+(\\S)+")) {
-            try {
-                bot.send(Lookup.lookup(args));
-            } catch (UnknownHostException ignore) {
-                if (args.matches(
-                        "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\."
-                        + "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)")) {
-                    try {
-                        final String[] lines = Lookup.whois(args);
-
-                        if ((lines != null) && (lines.length > 0)) {
-                            String line;
-
-                            for (final String rawLine : lines) {
-                                line = rawLine.trim();
-
-                                if ((line.length() > 0) && (line.charAt(0) != '#')) {
-                                    bot.send(line);
-                                }
-                            }
-                        } else {
-                            bot.send("Unknown host.");
-                        }
-                    } catch (IOException ioe) {
-                        bot.getLogger().debug("Unable to perform whois IP lookup: {}", args, ioe);
-                        bot.send("Unable to perform whois IP lookup: " + ioe.getMessage());
-                    }
-                } else {
-                    bot.send("Unknown host.");
-                }
-            }
-        } else {
-            helpResponse(sender, true);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
new file mode 100644
index 0000000..cca419e
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -0,0 +1,169 @@
+/*
+ * Lookup.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import org.apache.commons.net.whois.WhoisClient
+import java.io.IOException
+import java.net.InetAddress
+import java.net.UnknownHostException
+
+/**
+ * The Lookup module.
+ */
+class Lookup(bot: Mobibot) : AbstractModule(bot) {
+    override fun commandResponse(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    ) {
+        if (args.matches("(\\S.)+(\\S)+".toRegex())) {
+            with(bot) {
+                try {
+                    send(lookup(args))
+                } catch (ignore: UnknownHostException) {
+                    if (args.matches(
+                            ("(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
+                                "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
+                                "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)").toRegex()
+                        )
+                    ) {
+                        try {
+                            val lines = whois(args)
+                            if (lines.isNotEmpty()) {
+                                var line: String
+                                for (rawLine in lines) {
+                                    line = rawLine.trim()
+                                    if (line.isNotEmpty() && line[0] != '#') {
+                                        send(line)
+                                    }
+                                }
+                            } else {
+                                send("Unknown host.")
+                            }
+                        } catch (ioe: IOException) {
+                            logger.debug("Unable to perform whois IP lookup: {}", args, ioe)
+                            send("Unable to perform whois IP lookup: ${ioe.message}")
+                        }
+                    } else {
+                        send("Unknown host.")
+                    }
+                }
+            }
+        } else {
+            helpResponse(sender, true)
+        }
+    }
+
+    companion object {
+        /**
+         * The whois default host.
+         */
+        const val WHOIS_HOST = "whois.arin.net"
+
+        // Lookup command
+        private const val LOOKUP_CMD = "lookup"
+
+        /**
+         * Performs a DNS lookup on the specified query.
+         */
+        @JvmStatic
+        @Throws(UnknownHostException::class)
+        fun lookup(query: String): String {
+            val buffer = StringBuilder()
+            val results = InetAddress.getAllByName(query)
+            var hostInfo: String
+            for (result in results) {
+                if (result.hostAddress == query) {
+                    hostInfo = result.hostName
+                    if (hostInfo == query) {
+                        throw UnknownHostException()
+                    }
+                } else {
+                    hostInfo = result.hostAddress
+                }
+                if (buffer.isNotEmpty()) {
+                    buffer.append(", ")
+                }
+                buffer.append(hostInfo)
+            }
+            return buffer.toString()
+        }
+
+        /**
+         * Performs a whois IP query.
+         *
+         * @param query The IP address.
+         * @return The IP whois data, if any.
+         * @throws java.io.IOException If a connection error occurs.
+         */
+        @Throws(IOException::class)
+        private fun whois(query: String): Array<String> {
+            return whois(query, WHOIS_HOST)
+        }
+
+        /**
+         * Performs a whois IP query.
+         */
+        @JvmStatic
+        @Throws(IOException::class)
+        fun whois(query: String, host: String): Array<String> {
+            val whoisClient = WhoisClient()
+            val lines: Array<String>
+            with(whoisClient) {
+                try {
+                    defaultTimeout = Constants.CONNECT_TIMEOUT
+                    connect(host)
+                    soTimeout = Constants.CONNECT_TIMEOUT
+                    setSoLinger(false, 0)
+                    lines = if (WHOIS_HOST == host) {
+                        query("n - $query").split("\n").toTypedArray()
+                    } else {
+                        query(query).split("\n").toTypedArray()
+                    }
+                } finally {
+                    disconnect()
+                }
+            }
+            return lines
+        }
+    }
+
+    init {
+        commands.add(LOOKUP_CMD)
+        help.add("To perform a DNS lookup query:")
+        help.add(Utils.helpIndent("%c $LOOKUP_CMD <ip address or hostname>"))
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.java b/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.java
deleted file mode 100644
index 13ab2fa..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * ModuleException.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import net.thauvin.erik.mobibot.Utils;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * The <code>ModuleException</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-07
- * @since 1.0
- */
-public class ModuleException extends Exception {
-    private static final long serialVersionUID = 1L;
-
-    private final String debugMessage;
-
-    /**
-     * Creates a new exception.
-     *
-     * @param message The exception message.
-     */
-    ModuleException(final String message) {
-        super(message);
-        this.debugMessage = message;
-    }
-
-    /**
-     * Creates a new exception.
-     *
-     * @param debugMessage The debug message.
-     * @param message      The exception message.
-     * @param cause        The cause.
-     */
-    ModuleException(final String debugMessage, final String message, final Throwable cause) {
-        super(message, cause);
-        this.debugMessage = debugMessage;
-    }
-
-    /**
-     * Creates a new exception.
-     *
-     * @param debugMessage The debug message.
-     * @param message      The exception message.
-     */
-    ModuleException(final String debugMessage, final String message) {
-        super(message);
-        this.debugMessage = debugMessage;
-    }
-
-    /**
-     * Returns the debug message.
-     *
-     * @return The debug message.
-     */
-    String getDebugMessage() {
-        return debugMessage;
-    }
-
-    /**
-     * Return the sanitized message (e.g. remove API keys, etc.)
-     *
-     * @param sanitize The words to sanitize.
-     * @return The sanitized message.
-     */
-    String getSanitizedMessage(final String... sanitize) {
-        final String[] obfuscate = new String[sanitize.length];
-        for (int i = 0; i < sanitize.length; i++) {
-            obfuscate[i] = Utils.obfuscate(sanitize[i]);
-        }
-        return getCause().getClass().getName() + ": " + StringUtils.replaceEach(getCause().getMessage(),
-                                                                                sanitize,
-                                                                                obfuscate);
-    }
-
-    /**
-     * Return <code>true</code> if the exception has a cause.
-     *
-     * @return <code>true</code> or <code>false</code>
-     */
-    @SuppressWarnings("unused")
-    boolean hasCause() {
-        return getCause() != null;
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
new file mode 100644
index 0000000..3b10ada
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -0,0 +1,89 @@
+/*
+ * ModuleException.kit
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Utils
+import org.apache.commons.lang3.StringUtils
+
+/**
+ * The `ModuleException` class.
+ */
+class ModuleException : Exception {
+    /**
+     * Returns the debug message.
+     */
+    val debugMessage: String?
+
+    /**
+     * Creates a new exception.
+     */
+    constructor(message: String?) : super(message) {
+        debugMessage = message
+    }
+
+    /**
+     * Creates a new exception.
+     */
+    constructor(debugMessage: String?, message: String?, cause: Throwable?) : super(message, cause) {
+        this.debugMessage = debugMessage
+    }
+
+    /**
+     * Creates a new exception.
+     */
+    constructor(debugMessage: String?, message: String?) : super(message) {
+        this.debugMessage = debugMessage
+    }
+
+    /**
+     * Return the sanitized message (e.g. remove API keys, etc.)
+     */
+    fun getSanitizedMessage(vararg sanitize: String?): String {
+        val obfuscate = arrayOfNulls<String>(sanitize.size)
+        for (i in sanitize.indices) {
+            obfuscate[i] = Utils.obfuscate(sanitize[i])
+        }
+        return cause!!.javaClass.name + ": " + StringUtils.replaceEach(cause.message, sanitize, obfuscate)
+    }
+
+    /**
+     * Return `true` if the exception has a cause.
+     */
+    @Suppress("unused")
+    fun hasCause(): Boolean {
+        return cause != null
+    }
+
+    companion object {
+        private const val serialVersionUID = 1L
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
deleted file mode 100644
index 2e10363..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Ping.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * The Ping module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2016-07-02
- * @since 1.0
- */
-public class Ping extends AbstractModule {
-    /**
-     * The ping responses.
-     */
-    static final List<String> PINGS =
-            Arrays.asList(
-                    "is barely alive.",
-                    "is trying to stay awake.",
-                    "has gone fishing.",
-                    "is somewhere over the rainbow.",
-                    "has fallen and can't get up.",
-                    "is running. You better go chase it.",
-                    "has just spontaneously combusted.",
-                    "is talking to itself... don't interrupt. That's rude.",
-                    "is bartending at an AA meeting.",
-                    "is hibernating.",
-                    "is saving energy: apathetic mode activated.",
-                    "is busy. Go away!");
-    /**
-     * The ping command.
-     */
-    private static final String PING_CMD = "ping";
-
-    /**
-     * The default constructor.
-     */
-    public Ping(final Mobibot bot) {
-        super(bot);
-
-        commands.add(PING_CMD);
-
-        help.add("To ping the bot:");
-        help.add(Utils.helpIndent("%c " + PING_CMD));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void commandResponse(final String sender,
-                                final String cmd,
-                                final String args,
-                                final boolean isPrivate) {
-        final SecureRandom r = new SecureRandom();
-        bot.action(PINGS.get(r.nextInt(PINGS.size())));
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
new file mode 100644
index 0000000..980ece9
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
@@ -0,0 +1,90 @@
+/*
+ * Ping.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import kotlin.random.Random
+
+/**
+ * The Ping module.
+ */
+class Ping(bot: Mobibot) : AbstractModule(bot) {
+    /**
+     * {@inheritDoc}
+     */
+    override fun commandResponse(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    ) {
+        bot.action(randomPing())
+    }
+
+    companion object {
+        /**
+         * The ping responses.
+         */
+        @JvmField
+        val PINGS = listOf(
+            "is barely alive.",
+            "is trying to stay awake.",
+            "has gone fishing.",
+            "is somewhere over the rainbow.",
+            "has fallen and can't get up.",
+            "is running. You better go chase it.",
+            "has just spontaneously combusted.",
+            "is talking to itself... don't interrupt. That's rude.",
+            "is bartending at an AA meeting.",
+            "is hibernating.",
+            "is saving energy: apathetic mode activated.",
+            "is busy. Go away!"
+        )
+
+        @JvmStatic
+        fun randomPing(): String {
+            return PINGS[Random.nextInt(PINGS.size)]
+        }
+
+        /**
+         * The ping command.
+         */
+        private const val PING_CMD = "ping"
+    }
+
+    init {
+        commands.add(PING_CMD)
+        help.add("To ping the bot:")
+        help.add(Utils.helpIndent("%c $PING_CMD"))
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 68bf1e3..9bcc1ad 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -34,9 +34,6 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
-import net.thauvin.erik.mobibot.Utils.bold
-import net.thauvin.erik.mobibot.Utils.green
-import net.thauvin.erik.mobibot.Utils.red
 import kotlin.random.Random
 
 
@@ -96,21 +93,23 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
         }
     }
 
-    override fun commandResponse(sender: String, cmd: String, args: String?, isPrivate: Boolean) {
+    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)]
-        when {
-            hand == botHand -> {
-                bot.send("${green(hand.name)} vs. ${green(botHand.name)}")
-                bot.action("tied.")
-            }
-            hand.beats(botHand) -> {
-                bot.send("${green(hand.name)} ${bold(hand.action)} ${red(botHand.name)}")
-                bot.action("lost.")
-            }
-            else -> {
-                bot.send("${green(botHand.name)} ${bold(botHand.action)} ${red(hand.name)}")
-                bot.action("wins.")
+        with(bot) {
+            when {
+                hand == botHand -> {
+                    send("${Utils.green(hand.name)} vs. ${Utils.green(botHand.name)}")
+                    action("tied.")
+                }
+                hand.beats(botHand) -> {
+                    send("${Utils.green(hand.name)} ${Utils.bold(hand.action)} ${Utils.red(botHand.name)}")
+                    action("lost.")
+                }
+                else -> {
+                    send("${Utils.green(botHand.name)} ${Utils.bold(botHand.action)} ${Utils.red(hand.name)}")
+                    action("wins.")
+                }
             }
         }
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
deleted file mode 100644
index 4e5c1c9..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * StockQuote.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.msg.ErrorMessage;
-import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.msg.NoticeMessage;
-import net.thauvin.erik.mobibot.msg.PublicMessage;
-import org.apache.commons.lang3.StringUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * The StockQuote module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created Feb 7, 2004
- * @since 1.0
- */
-public final class StockQuote extends ThreadedModule {
-    /**
-     * The Alpha Advantage property key.
-     */
-    static final String ALPHAVANTAGE_API_KEY_PROP = "alphavantage-api-key";
-    /**
-     * The Invalid Symbol error string.
-     */
-    static final String INVALID_SYMBOL = "Invalid symbol.";
-    // Alpha Advantage URL
-    private static final String ALAPHAVANTAGE_URL = "https://www.alphavantage.co/query?function=";
-    // Quote command
-    private static final String STOCK_CMD = "stock";
-
-    /**
-     * Creates a new {@link StockQuote} instance.
-     */
-    public StockQuote(final Mobibot bot) {
-        super(bot);
-        commands.add(STOCK_CMD);
-
-        help.add("To retrieve a stock quote:");
-        help.add(Utils.helpIndent("%c " + STOCK_CMD + " <symbol|keywords>"));
-
-        initProperties(ALPHAVANTAGE_API_KEY_PROP);
-    }
-
-    @SuppressFBWarnings(value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
-                        justification = "false positive?")
-    private static JSONObject getJsonResponse(final String response, final String debugMessage)
-            throws ModuleException {
-        if (StringUtils.isNotBlank(response)) {
-            final JSONObject json = new JSONObject(response);
-
-            try {
-                final String info = json.getString("Information");
-                if (!info.isEmpty()) {
-                    throw new ModuleException(debugMessage, Utils.unescapeXml(info));
-                }
-            } catch (JSONException ignore) {
-                // Do nothing
-            }
-
-            try {
-                final String error = json.getString("Note");
-                if (!error.isEmpty()) {
-                    throw new ModuleException(debugMessage, Utils.unescapeXml(error));
-                }
-            } catch (JSONException ignore) {
-                // Do nothing
-            }
-
-            try {
-                final String error = json.getString("Error Message");
-                if (!error.isEmpty()) {
-                    throw new ModuleException(debugMessage, Utils.unescapeXml(error));
-                }
-            } catch (JSONException ignore) {
-                // Do nothing
-            }
-
-            return json;
-        } else {
-            throw new ModuleException(debugMessage, "Empty Response.");
-        }
-    }
-
-    /**
-     * Retrieves a stock quote.
-     *
-     * @param symbol The stock symbol.
-     * @return The {@link Message} array containing the stock quote.
-     * @throws ModuleException If an errors occurs.
-     */
-    @SuppressWarnings({ "PMD.CloseResource" })
-    static List<Message> getQuote(final String symbol, final String apiKey) throws ModuleException {
-        if (StringUtils.isBlank(apiKey)) {
-            throw new ModuleException(StringUtils.capitalize(STOCK_CMD) + " is disabled. The API key is missing.");
-        }
-
-        if (StringUtils.isNotBlank(symbol)) {
-            final String debugMessage = "getQuote(" + symbol + ')';
-            final ArrayList<Message> messages = new ArrayList<>();
-
-            String response;
-            try {
-                // Search for symbol/keywords
-                response = Utils.urlReader(new URL(
-                        ALAPHAVANTAGE_URL + "SYMBOL_SEARCH&keywords=" + Utils.encodeUrl(symbol) + "&apikey="
-                        + Utils.encodeUrl(apiKey)));
-
-                JSONObject json = getJsonResponse(response, debugMessage);
-
-                final JSONArray symbols = json.getJSONArray("bestMatches");
-                if (symbols.isEmpty()) {
-                    messages.add(new ErrorMessage(INVALID_SYMBOL));
-                    return messages;
-                }
-
-                final JSONObject symbolInfo = symbols.getJSONObject(0);
-
-                // Get quote for symbol
-                response = Utils.urlReader(new URL(
-                        ALAPHAVANTAGE_URL + "GLOBAL_QUOTE&symbol=" + Utils.encodeUrl(symbolInfo.getString("1. symbol"))
-                        + "&apikey=" + Utils.encodeUrl(apiKey)));
-
-                json = getJsonResponse(response, debugMessage);
-
-                final JSONObject quote = json.getJSONObject("Global Quote");
-
-                if (quote.isEmpty()) {
-                    messages.add(new ErrorMessage(INVALID_SYMBOL));
-                    return messages;
-                }
-
-                messages.add(new PublicMessage(
-                        "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol")) + " [" + Utils.unescapeXml(
-                                symbolInfo.getString("2. name") + ']')));
-                messages.add(new PublicMessage("    Price:     " + Utils.unescapeXml(quote.getString("05. price"))));
-                messages.add(new PublicMessage(
-                        "    Previous:  "
-                        + Utils.unescapeXml(quote.getString("08. previous close"))));
-                messages.add(new NoticeMessage("    Open:      " + Utils.unescapeXml(quote.getString("02. open"))));
-                messages.add(new NoticeMessage("    High:      " + Utils.unescapeXml(quote.getString("03. high"))));
-                messages.add(new NoticeMessage("    Low:       " + Utils.unescapeXml(quote.getString("04. low"))));
-                messages.add(new NoticeMessage("    Volume:    " + Utils.unescapeXml(quote.getString("06. volume"))));
-                messages.add(new NoticeMessage(
-                        "    Latest:    " + Utils.unescapeXml(quote.getString("07. latest trading day"))));
-                messages.add(new NoticeMessage(
-                        "    Change:    " + Utils.unescapeXml(quote.getString("09. change")) + " [" + Utils.unescapeXml(
-                                quote.getString("10. change percent")) + ']'));
-            } catch (IOException | NullPointerException e) {
-                throw new ModuleException(debugMessage, "An error has occurred retrieving a stock quote.", e);
-            }
-            return messages;
-        } else {
-            throw new ModuleException(INVALID_SYMBOL);
-        }
-    }
-
-    /**
-     * Returns the specified stock quote from Alpha Avantage.
-     */
-    @Override
-    void run(final String sender, final String cmd, final String symbol, final boolean isPrivate) {
-        if (StringUtils.isNotBlank(symbol)) {
-            try {
-                final List<Message> messages = getQuote(symbol, properties.get(ALPHAVANTAGE_API_KEY_PROP));
-                for (final Message msg : messages) {
-                    bot.send(sender, msg);
-                }
-            } catch (ModuleException e) {
-                bot.getLogger().warn(e.getDebugMessage(), e);
-                bot.send(e.getMessage());
-            }
-        } else {
-            helpResponse(sender, isPrivate);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
new file mode 100644
index 0000000..bcf1838
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -0,0 +1,214 @@
+/*
+ * StockQuote.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.msg.ErrorMessage
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.NoticeMessage
+import net.thauvin.erik.mobibot.msg.PublicMessage
+import org.apache.commons.lang3.StringUtils
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.IOException
+import java.net.URL
+import java.util.*
+
+/**
+ * The StockQuote module.
+ */
+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) {
+            if (StringUtils.isNotBlank(args)) {
+                try {
+                    val messages = getQuote(args, properties[ALPHAVANTAGE_API_KEY_PROP])
+                    for (msg in messages) {
+                        send(sender, msg)
+                    }
+                } catch (e: ModuleException) {
+                    logger.warn(e.debugMessage, e)
+                    send(e.message)
+                }
+            } else {
+                helpResponse(sender, isPrivate)
+            }
+        }
+    }
+
+    companion object {
+        /**
+         * The Alpha Advantage property key.
+         */
+        const val ALPHAVANTAGE_API_KEY_PROP = "alphavantage-api-key"
+
+        /**
+         * The Invalid Symbol error string.
+         */
+        const val INVALID_SYMBOL = "Invalid symbol."
+
+        // Alpha Advantage URL
+        private const val ALAPHAVANTAGE_URL = "https://www.alphavantage.co/query?function="
+
+        // Quote command
+        private const val STOCK_CMD = "stock"
+
+        @Throws(ModuleException::class)
+        private fun getJsonResponse(response: String, debugMessage: String): JSONObject {
+            return if (StringUtils.isNotBlank(response)) {
+                val json = JSONObject(response)
+                try {
+                    val info = json.getString("Information")
+                    if (info.isNotEmpty()) {
+                        throw ModuleException(debugMessage, Utils.unescapeXml(info))
+                    }
+                } catch (ignore: JSONException) {
+                    // Do nothing
+                }
+                try {
+                    var error = json.getString("Note")
+                    if (error.isNotEmpty()) {
+                        throw ModuleException(debugMessage, Utils.unescapeXml(error))
+                    }
+                    error = json.getString("Error Message")
+                    if (error.isNotEmpty()) {
+                        throw ModuleException(debugMessage, Utils.unescapeXml(error))
+                    }
+                } catch (ignore: JSONException) {
+                    // Do nothing
+                }
+                json
+            } else {
+                throw ModuleException(debugMessage, "Empty Response.")
+            }
+        }
+
+        /**
+         * Retrieves a stock quote.
+         */
+        @JvmStatic
+        @Throws(ModuleException::class)
+        fun getQuote(symbol: String, apiKey: String?): List<Message> {
+            if (StringUtils.isBlank(apiKey)) {
+                throw ModuleException("${STOCK_CMD.capitalize()} is disabled. The API key is missing.")
+            }
+            return if (StringUtils.isNotBlank(symbol)) {
+                val debugMessage = "getQuote($symbol)"
+                val messages = ArrayList<Message>()
+                var response: String
+                try {
+                    with(messages) {
+                        // Search for symbol/keywords
+                        response = Utils.urlReader(
+                            URL(
+                                "${ALAPHAVANTAGE_URL}SYMBOL_SEARCH&keywords=" + Utils.encodeUrl(symbol) + "&apikey="
+                                    + Utils.encodeUrl(apiKey)
+                            )
+                        )
+                        var json = getJsonResponse(response, debugMessage)
+                        val symbols = json.getJSONArray("bestMatches")
+                        if (symbols.isEmpty) {
+                            messages.add(ErrorMessage(INVALID_SYMBOL))
+                        } else {
+                            val symbolInfo = symbols.getJSONObject(0)
+
+                            // Get quote for symbol
+                            response = Utils.urlReader(
+                                URL(
+                                    "${ALAPHAVANTAGE_URL}GLOBAL_QUOTE&symbol="
+                                        + Utils.encodeUrl(symbolInfo.getString("1. symbol"))
+                                        + "&apikey=" + Utils.encodeUrl(apiKey)
+                                )
+                            )
+                            json = getJsonResponse(response, debugMessage)
+                            val quote = json.getJSONObject("Global Quote")
+                            if (quote.isEmpty) {
+                                add(ErrorMessage(INVALID_SYMBOL))
+                                return messages
+                            }
+                            add(
+                                PublicMessage(
+                                    "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol"))
+                                        + " [" + Utils.unescapeXml(symbolInfo.getString("2. name")) + ']'
+                                )
+                            )
+                            add(PublicMessage("    Price:     " + Utils.unescapeXml(quote.getString("05. price"))))
+                            add(
+                                PublicMessage(
+                                    "    Previous:  " + Utils.unescapeXml(quote.getString("08. previous close"))
+                                )
+                            )
+                            add(NoticeMessage("    Open:      " + Utils.unescapeXml(quote.getString("02. open"))))
+                            add(NoticeMessage("    High:      " + Utils.unescapeXml(quote.getString("03. high"))))
+                            add(NoticeMessage("    Low:       " + Utils.unescapeXml(quote.getString("04. low"))))
+                            add(
+                                NoticeMessage(
+                                    "    Volume:    " + Utils.unescapeXml(quote.getString("06. volume"))
+                                )
+                            )
+                            add(
+                                NoticeMessage(
+                                    "    Latest:    "
+                                        + Utils.unescapeXml(quote.getString("07. latest trading day"))
+                                )
+                            )
+                            add(
+                                NoticeMessage(
+                                    "    Change:    " + Utils.unescapeXml(quote.getString("09. change"))
+                                        + " [" + Utils.unescapeXml(quote.getString("10. change percent")) + ']'
+                                )
+                            )
+                        }
+                    }
+                } catch (e: IOException) {
+                    throw ModuleException(debugMessage, "An IO error has occurred retrieving a stock quote.", e)
+                } catch (e: NullPointerException) {
+                    throw ModuleException(debugMessage, "An error has occurred retrieving a stock quote.", e)
+                }
+                messages
+            } else {
+                throw ModuleException(INVALID_SYMBOL)
+            }
+        }
+    }
+
+    init {
+        commands.add(STOCK_CMD)
+        help.add("To retrieve a stock quote:")
+        help.add(Utils.helpIndent("%c $STOCK_CMD <symbol|keywords>"))
+        initProperties(ALPHAVANTAGE_API_KEY_PROP)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
similarity index 64%
rename from src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java
rename to src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
index 11d3cec..97a07e5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
@@ -29,40 +29,34 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot.modules
 
-package net.thauvin.erik.mobibot.modules;
-
-import net.thauvin.erik.mobibot.Mobibot;
+import net.thauvin.erik.mobibot.Mobibot
 
 /**
- * The <code>ThreadedModule</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-03
- * @since 1.0
+ * The `ThreadedModule` class.
  */
-public abstract class ThreadedModule extends AbstractModule {
-    ThreadedModule(final Mobibot bot) {
-        super(bot);
-    }
-
-    @Override
-    public void commandResponse(final String sender,
-                                final String cmd,
-                                final String args,
-                                final boolean isPrivate) {
-        if (isEnabled() && args.length() > 0) {
-            new Thread(() -> run(sender, cmd, args, isPrivate)).start();
+abstract class ThreadedModule(bot: Mobibot) : AbstractModule(bot) {
+    override fun commandResponse(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    ) {
+        if (isEnabled && args.isNotEmpty()) {
+            Thread { run(sender, cmd, args, isPrivate) }.start()
         } else {
-            helpResponse(sender, isPrivate);
+            helpResponse(sender, isPrivate)
         }
     }
 
     /**
      * Runs the thread.
      */
-    abstract void run(String sender,
-                      @SuppressWarnings("unused") String cmd,
-                      String args,
-                      boolean isPrivate);
+    abstract fun run(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    )
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
deleted file mode 100644
index 87446a5..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Twitter.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Constants;
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.ReleaseInfo;
-import net.thauvin.erik.mobibot.TwitterTimer;
-import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.commands.links.LinksMgr;
-import net.thauvin.erik.mobibot.entries.EntryLink;
-import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.msg.NoticeMessage;
-import org.apache.commons.lang3.StringUtils;
-import twitter4j.DirectMessage;
-import twitter4j.Status;
-import twitter4j.TwitterFactory;
-import twitter4j.conf.ConfigurationBuilder;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-
-/**
- * The Twitter module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created Sept 10, 2008
- * @since 1.0
- */
-public final class Twitter extends ThreadedModule {
-    // Property keys
-    static final String AUTOPOST_PROP = "twitter-auto-post";
-    static final String CONSUMER_KEY_PROP = "twitter-consumerKey";
-    static final String CONSUMER_SECRET_PROP = "twitter-consumerSecret";
-    static final String HANDLE_PROP = "twitter-handle";
-    static final String TOKEN_PROP = "twitter-token";
-    static final String TOKEN_SECRET_PROP = "twitter-tokenSecret";
-    // Twitter command
-    private static final String TWITTER_CMD = "twitter";
-
-    // Twitter auto-posts.
-    private final Set<Integer> entries = new HashSet<>();
-
-    /**
-     * Creates a new {@link Twitter} instance.
-     */
-    public Twitter(final Mobibot bot) {
-        super(bot);
-
-        commands.add(TWITTER_CMD);
-
-        help.add("To post to Twitter:");
-        help.add(Utils.helpIndent("%c " + TWITTER_CMD + " <message>"));
-
-        properties.put(AUTOPOST_PROP, "false");
-        initProperties(CONSUMER_KEY_PROP, CONSUMER_SECRET_PROP, HANDLE_PROP, TOKEN_PROP, TOKEN_SECRET_PROP);
-    }
-
-    /**
-     * Posts on Twitter.
-     *
-     * @param consumerKey    The consumer key.
-     * @param consumerSecret The consumer secret.
-     * @param token          The token.
-     * @param tokenSecret    The token secret.
-     * @param handle         The Twitter handle (dm) or nickname.
-     * @param message        The message to post.
-     * @param isDm           The direct message flag.
-     * @return The confirmation {@link Message}.
-     * @throws ModuleException If an error occurs while posting.
-     */
-    static Message twitterPost(final String consumerKey,
-                               final String consumerSecret,
-                               final String token,
-                               final String tokenSecret,
-                               final String handle,
-                               final String message,
-                               final boolean isDm) throws ModuleException {
-        try {
-            final ConfigurationBuilder cb = new ConfigurationBuilder();
-            cb.setDebugEnabled(true).setOAuthConsumerKey(consumerKey).setOAuthConsumerSecret(consumerSecret)
-              .setOAuthAccessToken(token).setOAuthAccessTokenSecret(tokenSecret);
-
-            final TwitterFactory tf = new TwitterFactory(cb.build());
-            final twitter4j.Twitter twitter = tf.getInstance();
-
-            if (!isDm) {
-                final Status status = twitter.updateStatus(message);
-                return new NoticeMessage("You message was posted to https://twitter.com/" + twitter.getScreenName()
-                                         + "/statuses/" + status.getId());
-            } else {
-                final DirectMessage dm = twitter.sendDirectMessage(handle, message);
-                return new NoticeMessage(dm.getText());
-            }
-        } catch (Exception e) {
-            throw new ModuleException("twitterPost(" + message + ")", "An error has occurred: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Add an entry to be posted on Twitter.
-     *
-     * @param index The entry index.
-     */
-    public final void addEntry(final int index) {
-        entries.add(index);
-    }
-
-    public final int entriesCount() {
-        return entries.size();
-    }
-
-    public String getHandle() {
-        return properties.get(HANDLE_PROP);
-    }
-
-    public final boolean hasEntry(final int index) {
-        return entries.contains(index);
-    }
-
-    public boolean isAutoPost() {
-        return isEnabled() && Boolean.parseBoolean(properties.get(AUTOPOST_PROP));
-    }
-
-    @Override
-    boolean isValidProperties() {
-        for (final String s : getPropertyKeys()) {
-            if (!AUTOPOST_PROP.equals(s) && !HANDLE_PROP.equals(s) && StringUtils.isBlank(properties.get(s))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Send a notification to the registered Twitter handle.
-     *
-     * @param msg The twitter message.
-     */
-    public final void notification(final String msg) {
-        if (isEnabled() && isNotBlank(getHandle())) {
-            new Thread(() -> {
-                try {
-                    post(String.format(msg, bot.getName(), ReleaseInfo.VERSION, bot.getChannel()), true);
-                } catch (ModuleException e) {
-                    bot.getLogger().warn("Failed to notify @{}: {}", getHandle(), msg, e);
-                }
-            }).start();
-        }
-    }
-
-    /**
-     * Posts on Twitter.
-     *
-     * @param message The message to post.
-     * @param isDm    The direct message flag.
-     * @throws ModuleException If an error occurs while posting.
-     */
-    public void post(final String message, final boolean isDm)
-            throws ModuleException {
-        post(properties.get(HANDLE_PROP), message, isDm);
-    }
-
-    /**
-     * Posts on Twitter.
-     *
-     * @param handle  The Twitter handle (dm) or nickname.
-     * @param message The message to post.
-     * @param isDm    The direct message flag.
-     * @return The {@link Message} to send back.
-     * @throws ModuleException If an error occurs while posting.
-     */
-    public Message post(final String handle, final String message, final boolean isDm)
-            throws ModuleException {
-        return twitterPost(properties.get(CONSUMER_KEY_PROP),
-                           properties.get(CONSUMER_SECRET_PROP),
-                           properties.get(TOKEN_PROP),
-                           properties.get(TOKEN_SECRET_PROP),
-                           handle,
-                           message,
-                           isDm);
-    }
-
-    /**
-     * Post an entry to twitter.
-     *
-     * @param index The post entry index.
-     */
-    @SuppressFBWarnings("SUI_CONTAINS_BEFORE_REMOVE")
-    public final void postEntry(final int index) {
-        if (isAutoPost() && hasEntry(index) && LinksMgr.getEntriesCount() >= index) {
-            final EntryLink entry = LinksMgr.getEntry(index);
-            final String msg =
-                    entry.getTitle() + ' ' + entry.getLink() + " via " + entry.getNick() + " on " + bot.getChannel();
-            new Thread(() -> {
-                try {
-                    if (bot.getLogger().isDebugEnabled()) {
-                        bot.getLogger().debug("Posting {}{} to Twitter.", Constants.LINK_CMD, index + 1);
-                    }
-                    post(msg, false);
-                } catch (ModuleException e) {
-                    bot.getLogger().warn("Failed to post entry on Twitter.", e);
-                }
-            }).start();
-            removeEntry(index);
-        }
-    }
-
-    public void queueEntry(final int index) {
-        if (isAutoPost()) {
-            addEntry(index);
-            bot.getLogger().debug("Scheduling ${Constants.LINK_CMD}${index + 1} for posting on Twitter.");
-            bot.getTimer().schedule(new TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L);
-        }
-    }
-
-    public final void removeEntry(final int index) {
-        entries.remove(index);
-    }
-
-    /**
-     * Posts to twitter.
-     */
-    @Override
-    void run(final String sender, final String cmd, final String message, final boolean isPrivate) {
-        try {
-            bot.send(sender,
-                     post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getMsg(),
-                     isPrivate);
-        } catch (ModuleException e) {
-            bot.getLogger().warn(e.getDebugMessage(), e);
-            bot.send(sender, e.getMessage(), isPrivate);
-        }
-    }
-
-    /**
-     * Post all the entries to Twitter on shutdown.
-     */
-    public final void shutdown() {
-        if (isAutoPost()) {
-            for (final int index : entries) {
-                postEntry(index);
-            }
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
new file mode 100644
index 0000000..07de9f9
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -0,0 +1,244 @@
+/*
+ * Twitter.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.TwitterTimer
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entriesCount
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.getEntry
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.NoticeMessage
+import org.apache.commons.lang3.StringUtils
+import twitter4j.TwitterException
+import twitter4j.TwitterFactory
+import twitter4j.conf.ConfigurationBuilder
+import java.util.*
+
+/**
+ * The Twitter module.
+ */
+class Twitter(bot: Mobibot) : ThreadedModule(bot) {
+    // Twitter auto-posts.
+    private val entries: MutableSet<Int> = HashSet()
+
+    /**
+     * Add an entry to be posted on Twitter.
+     */
+    private fun addEntry(index: Int) {
+        entries.add(index)
+    }
+
+    fun entriesCount(): Int {
+        return entries.size
+    }
+
+    private val handle: String?
+        get() = properties[HANDLE_PROP]
+
+    private fun hasEntry(index: Int): Boolean {
+        return entries.contains(index)
+    }
+
+    val isAutoPost: Boolean
+        get() = isEnabled && properties[AUTOPOST_PROP].toBoolean()
+
+    override val isValidProperties: Boolean
+        get() {
+            for (s in propertyKeys) {
+                if (AUTOPOST_PROP != s && HANDLE_PROP != s && properties[s]!!.isBlank()) {
+                    return false
+                }
+            }
+            return true
+        }
+
+    /**
+     * Send a notification to the registered Twitter handle.
+     */
+    fun notification(msg: String) {
+        with(bot) {
+            if (isEnabled && StringUtils.isNotBlank(handle)) {
+                Thread {
+                    try {
+                        post(message = msg, isDm = true)
+                        if (logger.isDebugEnabled) {
+                            logger.debug("Notified @{}: {}", handle, msg)
+                        }
+                    } catch (e: ModuleException) {
+                        logger.warn("Failed to notify @{}: {}", handle, msg, e)
+                    }
+                }.start()
+            }
+        }
+    }
+
+    /**
+     * Posts on Twitter.
+     */
+    @Throws(ModuleException::class)
+    fun post(handle: String = "${properties[HANDLE_PROP]}", message: String, isDm: Boolean): Message {
+        return twitterPost(
+            properties[CONSUMER_KEY_PROP],
+            properties[CONSUMER_SECRET_PROP],
+            properties[TOKEN_PROP],
+            properties[TOKEN_SECRET_PROP],
+            handle,
+            message,
+            isDm
+        )
+    }
+
+    /**
+     * Post an entry to twitter.
+     */
+    fun postEntry(index: Int) {
+        with(bot) {
+            if (isAutoPost && hasEntry(index) && entriesCount >= index) {
+                val entry = getEntry(index)
+                val msg = "${entry.title} ${entry.link} via ${entry.nick} on $channel"
+                Thread {
+                    try {
+                        if (logger.isDebugEnabled) {
+                            logger.debug("Posting {}{} to Twitter.", Constants.LINK_CMD, index + 1)
+                        }
+                        post(message = msg, isDm = false)
+                    } catch (e: ModuleException) {
+                        logger.warn("Failed to post entry on Twitter.", e)
+                    }
+                }.start()
+                removeEntry(index)
+            }
+        }
+    }
+
+    fun queueEntry(index: Int) {
+        if (isAutoPost) {
+            addEntry(index)
+            if (bot.logger.isDebugEnabled) {
+                bot.logger.debug("Scheduling {}{} for posting on Twitter.", Constants.LINK_CMD, index + 1)
+            }
+            bot.timer.schedule(TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L)
+        }
+    }
+
+    fun removeEntry(index: Int) {
+        entries.remove(index)
+    }
+
+    /**
+     * Posts to twitter.
+     */
+    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+        with(bot) {
+            try {
+                send(
+                    sender,
+                    post(sender, "$args (by $sender on $channel)", false).msg,
+                    isPrivate
+                )
+            } catch (e: ModuleException) {
+                logger.warn(e.debugMessage, e)
+                send(sender, e.message, isPrivate)
+            }
+        }
+    }
+
+    /**
+     * Post all the entries to Twitter on shutdown.
+     */
+    fun shutdown() {
+        if (isAutoPost) {
+            for (index in entries) {
+                postEntry(index)
+            }
+        }
+    }
+
+    companion object {
+        // Property keys
+        const val AUTOPOST_PROP = "twitter-auto-post"
+        const val CONSUMER_KEY_PROP = "twitter-consumerKey"
+        const val CONSUMER_SECRET_PROP = "twitter-consumerSecret"
+        const val HANDLE_PROP = "twitter-handle"
+        const val TOKEN_PROP = "twitter-token"
+        const val TOKEN_SECRET_PROP = "twitter-tokenSecret"
+
+        // Twitter command
+        private const val TWITTER_CMD = "twitter"
+
+        /**
+         * Posts on Twitter.
+         */
+        @JvmStatic
+        @Throws(ModuleException::class)
+        fun twitterPost(
+            consumerKey: String?,
+            consumerSecret: String?,
+            token: String?,
+            tokenSecret: String?,
+            handle: String?,
+            message: String,
+            isDm: Boolean
+        ): Message {
+            return try {
+                val cb = ConfigurationBuilder()
+                cb.setDebugEnabled(true)
+                    .setOAuthConsumerKey(consumerKey)
+                    .setOAuthConsumerSecret(consumerSecret)
+                    .setOAuthAccessToken(token).setOAuthAccessTokenSecret(tokenSecret)
+                val tf = TwitterFactory(cb.build())
+                val twitter = tf.instance
+                if (!isDm) {
+                    val status = twitter.updateStatus(message)
+                    NoticeMessage(
+                        "You message was posted to https://twitter.com/${twitter.screenName}/statuses/${status.id}"
+                    )
+                } else {
+                    val dm = twitter.sendDirectMessage(handle, message)
+                    NoticeMessage(dm.text)
+                }
+            } catch (e: TwitterException) {
+                throw ModuleException("twitterPost($message)", "An error has occurred: ${e.message}", e)
+            }
+        }
+    }
+
+    init {
+        commands.add(TWITTER_CMD)
+        help.add("To post to Twitter:")
+        help.add(Utils.helpIndent("%c $TWITTER_CMD <message>"))
+        properties[AUTOPOST_PROP] = "false"
+        initProperties(CONSUMER_KEY_PROP, CONSUMER_SECRET_PROP, HANDLE_PROP, TOKEN_PROP, TOKEN_SECRET_PROP)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index b1be81e..fe43ef5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -34,6 +34,7 @@ package net.thauvin.erik.mobibot.modules;
 
 import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
+import org.jetbrains.annotations.NotNull;
 
 import java.security.SecureRandom;
 
@@ -71,9 +72,9 @@ public final class War extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(final String sender,
-                                final String cmd,
-                                final String args,
+    public void commandResponse(@NotNull final String sender,
+                                @NotNull final String cmd,
+                                @NotNull final String args,
                                 final boolean isPrivate) {
         final SecureRandom r = new SecureRandom();
 
@@ -84,20 +85,21 @@ public final class War extends AbstractModule {
             i = r.nextInt(WAR_DECK.length);
             y = r.nextInt(WAR_DECK.length);
 
-            bot.send(sender + " drew the " + bold(WAR_DECK[i]) + " of " + bold(WAR_SUITS[r.nextInt(WAR_SUITS.length)]));
-            bot.action("drew the " + bold(WAR_DECK[y]) + " of " + bold(WAR_SUITS[r.nextInt(WAR_SUITS.length)]));
+            getBot().send(sender + " drew the " + bold(WAR_DECK[i]) + " of "
+                          + bold(WAR_SUITS[r.nextInt(WAR_SUITS.length)]));
+            getBot().action("drew the " + bold(WAR_DECK[y]) + " of " + bold(WAR_SUITS[r.nextInt(WAR_SUITS.length)]));
 
             if (i != y) {
                 break;
             }
 
-            bot.send("This means " + bold("WAR") + '!');
+            getBot().send("This means " + bold("WAR") + '!');
         }
 
         if (i < y) {
-            bot.action("lost.");
+            getBot().action("lost.");
         } else {
-            bot.action("wins.");
+            getBot().action("wins.");
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
deleted file mode 100644
index e1910ac..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Weather2.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import net.aksingh.owmjapis.api.APIException;
-import net.aksingh.owmjapis.core.OWM;
-import net.aksingh.owmjapis.model.CurrentWeather;
-import net.aksingh.owmjapis.model.param.Main;
-import net.aksingh.owmjapis.model.param.Weather;
-import net.aksingh.owmjapis.model.param.Wind;
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.msg.ErrorMessage;
-import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.msg.NoticeMessage;
-import net.thauvin.erik.mobibot.msg.PublicMessage;
-import org.apache.commons.lang3.StringUtils;
-import org.jibble.pircbot.Colors;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static net.thauvin.erik.mobibot.Utils.bold;
-
-/**
- * The <code>Weather2</code> module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2017-04-02
- * @since 1.0
- */
-public class Weather2 extends ThreadedModule {
-    /**
-     * The OpenWeatherMap API Key property.
-     */
-    static final String OWM_API_KEY_PROP = "owm-api-key";
-
-    // Weather command
-    private static final String WEATHER_CMD = "weather";
-
-    /**
-     * Creates a new {@link Weather2} instance.
-     */
-    public Weather2(final Mobibot bot) {
-        super(bot);
-
-        commands.add(WEATHER_CMD);
-
-        help.add("To display weather information:");
-        help.add(Utils.helpIndent("%c " + WEATHER_CMD + " <city> [, <country code>]"));
-        help.add("For example:");
-        help.add(Utils.helpIndent("%c " + WEATHER_CMD + " paris, fr"));
-        help.add("The default ISO 3166 country code is " + bold("US") + ". Zip codes supported in most countries.");
-
-        initProperties(OWM_API_KEY_PROP);
-    }
-
-    private static OWM.Country getCountry(final String countryCode) {
-        for (final OWM.Country c : OWM.Country.values()) {
-            if (c.name().equalsIgnoreCase(countryCode)) {
-                return c;
-            }
-        }
-
-        return OWM.Country.UNITED_STATES;
-    }
-
-    @SuppressWarnings("AvoidEscapedUnicodeCharacters")
-    private static String getTemps(final Double d) {
-        final double c = (d - 32) * 5 / 9;
-        return Math.round(d) + " °F, " + Math.round(c) + " °C";
-    }
-
-    /**
-     * Retrieves the weather data.
-     *
-     * <ul>
-     * <li>98204</li>
-     * <li>London, UK</li>
-     * </ul>
-     *
-     * @param query  The query.
-     * @param apiKey The API key.
-     * @return The {@link Message} array containing the weather data.
-     * @throws ModuleException If an error occurs while retrieving the weather data.
-     */
-    static List<Message> getWeather(final String query, final String apiKey) throws ModuleException {
-        if (StringUtils.isBlank(apiKey)) {
-            throw new ModuleException(StringUtils.capitalize(WEATHER_CMD) + " is disabled. The API key is missing.");
-        }
-
-        final OWM owm = new OWM(apiKey);
-        final ArrayList<Message> messages = new ArrayList<>();
-
-        owm.setUnit(OWM.Unit.IMPERIAL);
-
-        if (StringUtils.isNotBlank(query)) {
-            final String[] argv = query.split(",");
-
-            if (argv.length >= 1 && argv.length <= 2) {
-                final String country;
-                final String city = argv[0].trim();
-                if (argv.length > 1 && StringUtils.isNotBlank(argv[1])) {
-                    country = argv[1].trim();
-                } else {
-                    country = "US";
-                }
-
-                try {
-                    final CurrentWeather cwd;
-                    if (city.matches("\\d+")) {
-                        cwd = owm.currentWeatherByZipCode(Integer.parseInt(city), getCountry(country));
-                    } else {
-                        cwd = owm.currentWeatherByCityName(city, getCountry(country));
-                    }
-                    if (cwd.hasCityName()) {
-                        messages.add(new PublicMessage(
-                                "City: " + cwd.getCityName() + " [" + StringUtils.upperCase(country) + "]"));
-
-                        final Main main = cwd.getMainData();
-                        if (main != null) {
-                            if (main.hasTemp()) {
-                                messages.add(new PublicMessage("Temperature: " + getTemps(main.getTemp())));
-                            }
-
-                            if (main.hasHumidity() && (main.getHumidity() != null)) {
-                                messages.add(new NoticeMessage("Humidity: " + Math.round(main.getHumidity()) + "%"));
-                            }
-                        }
-
-                        if (cwd.hasWindData()) {
-                            final Wind w = cwd.getWindData();
-                            if (w != null && w.hasSpeed()) {
-                                messages.add(new NoticeMessage("Wind: " + wind(w.getSpeed())));
-                            }
-                        }
-
-                        if (cwd.hasWeatherList()) {
-                            final StringBuilder condition = new StringBuilder("Condition:");
-                            final List<Weather> list = cwd.getWeatherList();
-                            if (list != null) {
-                                for (final Weather w : list) {
-                                    condition.append(' ')
-                                             .append(StringUtils.capitalize(w.getDescription()))
-                                             .append('.');
-                                }
-                                messages.add(new NoticeMessage(condition.toString()));
-                            }
-                        }
-
-                        if (cwd.hasCityId() && cwd.getCityId() != null) {
-                            if (cwd.getCityId() > 0) {
-                                messages.add(new NoticeMessage("https://openweathermap.org/city/" + cwd.getCityId(),
-                                                               Colors.GREEN));
-                            } else {
-                                messages.add(new NoticeMessage("https://openweathermap.org/find?q=" + Utils.encodeUrl(
-                                        city + ',' + StringUtils.upperCase(country)), Colors.GREEN));
-                            }
-                        }
-                    }
-                } catch (APIException | NullPointerException e) {
-                    throw new ModuleException("getWeather(" + query + ')', "Unable to perform weather lookup.", e);
-                }
-            }
-        }
-
-        if (messages.isEmpty()) {
-            messages.add(new ErrorMessage("Invalid syntax."));
-        }
-
-        return messages;
-    }
-
-    private static String wind(final Double w) {
-        final double kmh = w * 1.60934;
-        return Math.round(w) + " mph, " + Math.round(kmh) + " km/h";
-    }
-
-    /**
-     * Fetches the weather data from a specific city.
-     */
-    @Override
-    void run(final String sender, final String cmd, final String args, final boolean isPrivate) {
-        if (StringUtils.isNotBlank(args)) {
-            try {
-                final List<Message> messages = getWeather(args, properties.get(OWM_API_KEY_PROP));
-                if (messages.get(0).isError()) {
-                    helpResponse(sender, isPrivate);
-                } else {
-                    for (final Message msg : messages) {
-                        bot.send(sender, msg);
-                    }
-                }
-            } catch (ModuleException e) {
-                bot.getLogger().debug(e.getDebugMessage(), e);
-                bot.send(e.getMessage());
-            }
-        } else {
-            helpResponse(sender, isPrivate);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
new file mode 100644
index 0000000..2dea6c7
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -0,0 +1,200 @@
+/*
+ * Weather2.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.aksingh.owmjapis.api.APIException
+import net.aksingh.owmjapis.core.OWM
+import net.aksingh.owmjapis.core.OWM.Country
+import net.aksingh.owmjapis.model.CurrentWeather
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.msg.ErrorMessage
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.NoticeMessage
+import net.thauvin.erik.mobibot.msg.PublicMessage
+import org.apache.commons.lang3.StringUtils
+import org.jibble.pircbot.Colors
+import java.util.*
+import kotlin.math.roundToInt
+
+/**
+ * The `Weather2` module.
+ */
+class Weather2(bot: Mobibot) : ThreadedModule(bot) {
+    /**
+     * Fetches the weather data from a specific city.
+     */
+    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+        if (StringUtils.isNotBlank(args)) {
+            try {
+                val messages = getWeather(args, properties[OWM_API_KEY_PROP])
+                if (messages[0].isError) {
+                    helpResponse(sender, isPrivate)
+                } else {
+                    for (msg in messages) {
+                        bot.send(sender, msg)
+                    }
+                }
+            } catch (e: ModuleException) {
+                bot.logger.debug(e.debugMessage, e)
+                bot.send(e.message)
+            }
+        } else {
+            helpResponse(sender, isPrivate)
+        }
+    }
+
+    companion object {
+        /**
+         * The OpenWeatherMap API Key property.
+         */
+        const val OWM_API_KEY_PROP = "owm-api-key"
+
+        // Weather command
+        private const val WEATHER_CMD = "weather"
+        private fun getCountry(countryCode: String): Country {
+            for (c in Country.values()) {
+                if (c.name.equals(countryCode, ignoreCase = true)) {
+                    return c
+                }
+            }
+            return Country.UNITED_STATES
+        }
+
+        private fun getTemps(d: Double?): String {
+            val c = (d!! - 32) * 5 / 9
+            return "${d.roundToInt()} °F, ${c.roundToInt()} °C"
+        }
+
+        /**
+         * Retrieves the weather data.
+         */
+        @JvmStatic
+        @Throws(ModuleException::class)
+        fun getWeather(query: String, apiKey: String?): List<Message> {
+            if (StringUtils.isBlank(apiKey)) {
+                throw ModuleException("${WEATHER_CMD.capitalize()} is disabled. The API key is missing.")
+            }
+            val owm = OWM(apiKey!!)
+            val messages = ArrayList<Message>()
+            owm.unit = OWM.Unit.IMPERIAL
+            if (StringUtils.isNotBlank(query)) {
+                val argv = query.split(",").toTypedArray()
+                if (argv.size in 1..2) {
+                    val city = argv[0].trim()
+                    val country: String = if (argv.size > 1 && StringUtils.isNotBlank(argv[1])) {
+                        argv[1].trim()
+                    } else {
+                        "US"
+                    }
+                    try {
+                        val cwd: CurrentWeather = if (city.matches("\\d+".toRegex())) {
+                            owm.currentWeatherByZipCode(city.toInt(), getCountry(country))
+                        } else {
+                            owm.currentWeatherByCityName(city, getCountry(country))
+                        }
+                        if (cwd.hasCityName()) {
+                            messages.add(
+                                PublicMessage("City: ${cwd.cityName} [${country.toUpperCase()}]")
+                            )
+                            with(cwd.mainData) {
+                                if (this != null) {
+                                    if (hasTemp()) {
+                                        messages.add(PublicMessage("Temperature: ${getTemps(temp)}"))
+                                    }
+                                    if (hasHumidity() && humidity != null) {
+                                        messages.add(NoticeMessage("Humidity: ${(humidity!!).roundToInt()}%"))
+                                    }
+                                }
+                            }
+                            if (cwd.hasWindData()) {
+                                with(cwd.windData) {
+                                    if (this != null && hasSpeed()) {
+                                        messages.add(NoticeMessage("Wind: ${wind(speed)}"))
+                                    }
+                                }
+                            }
+                            if (cwd.hasWeatherList()) {
+                                val condition = StringBuilder("Condition:")
+                                val list = cwd.weatherList
+                                if (list != null) {
+                                    for (w in list) {
+                                        condition.append(' ').append(w!!.getDescription().capitalize()).append('.')
+                                    }
+                                    messages.add(NoticeMessage(condition.toString()))
+                                }
+                            }
+                            if (cwd.hasCityId() && cwd.cityId != null) {
+                                if (cwd.cityId!! > 0) {
+                                    messages.add(
+                                        NoticeMessage("https://openweathermap.org/city/${cwd.cityId}", Colors.GREEN)
+                                    )
+                                } else {
+                                    messages.add(
+                                        NoticeMessage(
+                                            "https://openweathermap.org/find?q="
+                                                + Utils.encodeUrl("$city,${country.toUpperCase()}"),
+                                            Colors.GREEN
+                                        )
+                                    )
+                                }
+                            }
+                        }
+                    } catch (e: APIException) {
+                        throw ModuleException("getWeather($query)", "Unable to perform weather lookup.", e)
+                    } catch (e: NullPointerException) {
+                        throw ModuleException("getWeather($query)", "Unable to perform weather lookup.", e)
+                    }
+                }
+            }
+            if (messages.isEmpty()) {
+                messages.add(ErrorMessage("Invalid syntax."))
+            }
+            return messages
+        }
+
+        private fun wind(w: Double?): String {
+            val kmh = w!! * 1.60934
+            return "${Math.round(w)} mph, ${kmh.roundToInt()} km/h"
+        }
+    }
+
+    init {
+        commands.add(WEATHER_CMD)
+        help.add("To display weather information:")
+        help.add(Utils.helpIndent("%c $WEATHER_CMD <city> [, <country code>]"))
+        help.add("For example:")
+        help.add(Utils.helpIndent("%c $WEATHER_CMD paris, fr"))
+        help.add("The default ISO 3166 country code is ${Utils.bold("US")}. Zip codes supported in most countries.")
+        initProperties(OWM_API_KEY_PROP)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
deleted file mode 100644
index 05bcc22..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * WorldTime.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.msg.ErrorMessage;
-import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.mobibot.msg.PublicMessage;
-import org.apache.commons.lang3.StringUtils;
-
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoField;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * The WorldTime module.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-27
- * @since 1.0
- */
-@SuppressWarnings("PMD.UseConcurrentHashMap")
-public final class WorldTime extends AbstractModule {
-    // Beats (Internet Time) keyword
-    private static final String BEATS_KEYWORD = ".beats";
-    // Supported countries
-    private static final Map<String, String> COUNTRIES_MAP;
-
-    // The Time command
-    private static final String TIME_CMD = "time";
-
-    static {
-        // Initialize the countries map
-        final Map<String, String> countries = new TreeMap<>();
-        countries.put("AE", "Asia/Dubai");
-        countries.put("AF", "Asia/Kabul");
-        countries.put("AQ", "Antarctica/South_Pole");
-        countries.put("AT", "Europe/Vienna");
-        countries.put("AU", "Australia/Sydney");
-        countries.put("AKST", "America/Anchorage");
-        countries.put("AKDT", "America/Anchorage");
-        countries.put("BE", "Europe/Brussels");
-        countries.put("BR", "America/Sao_Paulo");
-        countries.put("CA", "America/Montreal");
-        countries.put("CDT", "America/Chicago");
-        countries.put("CET", "CET");
-        countries.put("CH", "Europe/Zurich");
-        countries.put("CN", "Asia/Shanghai");
-        countries.put("CST", "America/Chicago");
-        countries.put("CU", "Cuba");
-        countries.put("DE", "Europe/Berlin");
-        countries.put("DK", "Europe/Copenhagen");
-        countries.put("EDT", "America/New_York");
-        countries.put("EG", "Africa/Cairo");
-        countries.put("ER", "Africa/Asmara");
-        countries.put("ES", "Europe/Madrid");
-        countries.put("EST", "America/New_York");
-        countries.put("FI", "Europe/Helsinki");
-        countries.put("FR", "Europe/Paris");
-        countries.put("GB", "Europe/London");
-        countries.put("GMT", "GMT");
-        countries.put("GR", "Europe/Athens");
-        countries.put("HK", "Asia/Hong_Kong");
-        countries.put("HST", "Pacific/Honolulu");
-        countries.put("IE", "Europe/Dublin");
-        countries.put("IL", "Asia/Tel_Aviv");
-        countries.put("IN", "Asia/Kolkata");
-        countries.put("IQ", "Asia/Baghdad");
-        countries.put("IR", "Asia/Tehran");
-        countries.put("IS", "Atlantic/Reykjavik");
-        countries.put("IT", "Europe/Rome");
-        countries.put("JM", "Jamaica");
-        countries.put("JP", "Asia/Tokyo");
-        countries.put("LY", "Africa/Tripoli");
-        countries.put("MA", "Africa/Casablanca");
-        countries.put("MDT", "America/Denver");
-        countries.put("MH", "Kwajalein");
-        countries.put("MQ", "America/Martinique");
-        countries.put("MST", "America/Denver");
-        countries.put("MX", "America/Mexico_City");
-        countries.put("NL", "Europe/Amsterdam");
-        countries.put("NO", "Europe/Oslo");
-        countries.put("NP", "Asia/Katmandu");
-        countries.put("NZ", "Pacific/Auckland");
-        countries.put("PDT", "America/Los_Angeles");
-        countries.put("PH", "Asia/Manila");
-        countries.put("PK", "Asia/Karachi");
-        countries.put("PL", "Europe/Warsaw");
-        countries.put("PST", "America/Los_Angeles");
-        countries.put("PT", "Europe/Lisbon");
-        countries.put("PR", "America/Puerto_Rico");
-        countries.put("RU", "Europe/Moscow");
-        countries.put("SE", "Europe/Stockholm");
-        countries.put("SG", "Asia/Singapore");
-        countries.put("TH", "Asia/Bangkok");
-        countries.put("TM", "Asia/Ashgabat");
-        countries.put("TN", "Africa/Tunis");
-        countries.put("TR", "Europe/Istanbul");
-        countries.put("TW", "Asia/Taipei");
-        countries.put("UK", "Europe/London");
-        countries.put("US", "America/New_York");
-        countries.put("UTC", "UTC");
-        countries.put("VA", "Europe/Vatican");
-        countries.put("VE", "America/Caracas");
-        countries.put("VN", "Asia/Ho_Chi_Minh");
-        countries.put("ZA", "Africa/Johannesburg");
-        countries.put("ZULU", "Zulu");
-        countries.put("INTERNET", BEATS_KEYWORD);
-        countries.put("BEATS", BEATS_KEYWORD);
-
-        ZoneId.getAvailableZoneIds().stream()
-              .filter(tz -> !tz.contains("/") && tz.length() == 3 && !countries.containsKey(tz))
-              .forEach(tz -> countries.put(tz, tz));
-
-        COUNTRIES_MAP = Collections.unmodifiableMap(countries);
-    }
-
-    /**
-     * Creates a new {@link WorldTime} instance.
-     */
-    public WorldTime(final Mobibot bot) {
-        super(bot);
-
-        help.add("To display a country's current date/time:");
-        help.add(Utils.helpIndent("%c " + TIME_CMD) + " [<country code>]");
-        help.add("For a listing of the supported countries:");
-        help.add(Utils.helpIndent("%c " + TIME_CMD));
-
-        commands.add(TIME_CMD);
-    }
-
-
-    /**
-     * Returns the current Internet (beat) Time.
-     *
-     * @return The Internet Time string.
-     */
-    private static String internetTime() {
-        final ZonedDateTime zdt = ZonedDateTime.now(ZoneId.of("UTC+01:00"));
-        final int beats = (int) ((zdt.get(ChronoField.SECOND_OF_MINUTE) + (zdt.get(ChronoField.MINUTE_OF_HOUR) * 60)
-                                  + (zdt.get(ChronoField.HOUR_OF_DAY) * 3600)) / 86.4);
-        return String.format("%c%03d", '@', beats);
-    }
-
-    /**
-     * Returns the world time.
-     *
-     * <ul>
-     * <li>PST</li>
-     * <li>BEATS</li>
-     * </ul>
-     *
-     * @param query The query.
-     * @return The {@link Message} containing the world time.
-     */
-    @SuppressFBWarnings("STT_STRING_PARSING_A_FIELD")
-    static Message worldTime(final String query) {
-        final String tz = (COUNTRIES_MAP.get((StringUtils.upperCase(query.substring(query.indexOf(' ') + 1).trim()))));
-        final String response;
-
-        if (tz != null) {
-            if (BEATS_KEYWORD.equals(tz)) {
-                response = ("The current Internet Time is: " + Utils.bold(internetTime() + ' ' + BEATS_KEYWORD));
-            } else {
-                response = ZonedDateTime.now().withZoneSameInstant(ZoneId.of(tz)).format(
-                        DateTimeFormatter
-                                .ofPattern("'The time is " + Utils.bold("'HH:mm'") + " on " + Utils.bold(
-                                        "'EEEE, d MMMM yyyy'") + " in '"))
-                           + Utils.bold(tz.substring(tz.indexOf('/') + 1).replace('_', ' '));
-            }
-        } else {
-            return new ErrorMessage("Unsupported country/zone. Please try again.");
-        }
-
-        return new PublicMessage(response);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void commandResponse(final String sender,
-                                final String cmd,
-                                final String args,
-                                final boolean isPrivate) {
-        if (args.length() == 0) {
-            bot.send(sender, "The supported countries/zones are: ", isPrivate);
-            bot.sendList(sender, new ArrayList<>(COUNTRIES_MAP.keySet()), 17, false, false);
-        } else {
-            final Message msg = worldTime(args);
-            if (isPrivate) {
-                bot.send(sender, msg.getMsg(), true);
-            } else {
-                if (msg.isError()) {
-                    bot.send(sender, msg.getMsg(), false);
-                } else {
-                    bot.send(msg.getMsg());
-                }
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean isPrivateMsgEnabled() {
-        return true;
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
new file mode 100644
index 0000000..8ecc469
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -0,0 +1,219 @@
+/*
+ * WorldTime.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.msg.ErrorMessage
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.PublicMessage
+import org.apache.commons.lang3.StringUtils
+import java.time.ZoneId
+import java.time.ZonedDateTime
+import java.time.format.DateTimeFormatter
+import java.time.temporal.ChronoField
+import java.util.*
+
+/**
+ * The WorldTime module.
+ */
+class WorldTime(bot: Mobibot) : AbstractModule(bot) {
+    companion object {
+        // Beats (Internet Time) keyword
+        private const val BEATS_KEYWORD = ".beats"
+
+        // Supported countries
+        private var COUNTRIES_MAP: Map<String, String>
+
+        // The Time command
+        private const val TIME_CMD = "time"
+
+        /**
+         * Returns the current Internet (beat) Time.
+         */
+        private fun internetTime(): String {
+            val zdt = ZonedDateTime.now(ZoneId.of("UTC+01:00"))
+            val beats = ((zdt[ChronoField.SECOND_OF_MINUTE] + zdt[ChronoField.MINUTE_OF_HOUR] * 60
+                + zdt[ChronoField.HOUR_OF_DAY] * 3600) / 86.4).toInt()
+            return String.format("%c%03d", '@', beats)
+        }
+
+        /**
+         * Returns the world time.
+         */
+        @JvmStatic
+        fun worldTime(query: String): Message {
+            val tz = COUNTRIES_MAP[StringUtils.upperCase(query.substring(query.indexOf(' ') + 1).trim())]
+            val response: String = if (tz != null) {
+                if (BEATS_KEYWORD == tz) {
+                    "The current Internet Time is: " + Utils.bold(internetTime() + ' ' + BEATS_KEYWORD)
+                } else {
+                    (ZonedDateTime.now()
+                        .withZoneSameInstant(ZoneId.of(tz))
+                        .format(
+                            DateTimeFormatter.ofPattern(
+                                "'The time is ${Utils.bold("'HH:mm'")} on ${Utils.bold("'EEEE, d MMMM yyyy'")} in '"
+                            )
+                        )
+                        + Utils.bold(tz.substring(tz.indexOf('/') + 1).replace('_', ' '))
+                        )
+                }
+            } else {
+                return ErrorMessage("Unsupported country/zone. Please try again.")
+            }
+            return PublicMessage(response)
+        }
+
+        init {
+            // Initialize the countries map
+            val countries = TreeMap<String, String>()
+            countries["AE"] = "Asia/Dubai"
+            countries["AF"] = "Asia/Kabul"
+            countries["AQ"] = "Antarctica/South_Pole"
+            countries["AT"] = "Europe/Vienna"
+            countries["AU"] = "Australia/Sydney"
+            countries["AKST"] = "America/Anchorage"
+            countries["AKDT"] = "America/Anchorage"
+            countries["BE"] = "Europe/Brussels"
+            countries["BR"] = "America/Sao_Paulo"
+            countries["CA"] = "America/Montreal"
+            countries["CDT"] = "America/Chicago"
+            countries["CET"] = "CET"
+            countries["CH"] = "Europe/Zurich"
+            countries["CN"] = "Asia/Shanghai"
+            countries["CST"] = "America/Chicago"
+            countries["CU"] = "Cuba"
+            countries["DE"] = "Europe/Berlin"
+            countries["DK"] = "Europe/Copenhagen"
+            countries["EDT"] = "America/New_York"
+            countries["EG"] = "Africa/Cairo"
+            countries["ER"] = "Africa/Asmara"
+            countries["ES"] = "Europe/Madrid"
+            countries["EST"] = "America/New_York"
+            countries["FI"] = "Europe/Helsinki"
+            countries["FR"] = "Europe/Paris"
+            countries["GB"] = "Europe/London"
+            countries["GMT"] = "GMT"
+            countries["GR"] = "Europe/Athens"
+            countries["HK"] = "Asia/Hong_Kong"
+            countries["HST"] = "Pacific/Honolulu"
+            countries["IE"] = "Europe/Dublin"
+            countries["IL"] = "Asia/Tel_Aviv"
+            countries["IN"] = "Asia/Kolkata"
+            countries["IQ"] = "Asia/Baghdad"
+            countries["IR"] = "Asia/Tehran"
+            countries["IS"] = "Atlantic/Reykjavik"
+            countries["IT"] = "Europe/Rome"
+            countries["JM"] = "Jamaica"
+            countries["JP"] = "Asia/Tokyo"
+            countries["LY"] = "Africa/Tripoli"
+            countries["MA"] = "Africa/Casablanca"
+            countries["MDT"] = "America/Denver"
+            countries["MH"] = "Kwajalein"
+            countries["MQ"] = "America/Martinique"
+            countries["MST"] = "America/Denver"
+            countries["MX"] = "America/Mexico_City"
+            countries["NL"] = "Europe/Amsterdam"
+            countries["NO"] = "Europe/Oslo"
+            countries["NP"] = "Asia/Katmandu"
+            countries["NZ"] = "Pacific/Auckland"
+            countries["PDT"] = "America/Los_Angeles"
+            countries["PH"] = "Asia/Manila"
+            countries["PK"] = "Asia/Karachi"
+            countries["PL"] = "Europe/Warsaw"
+            countries["PST"] = "America/Los_Angeles"
+            countries["PT"] = "Europe/Lisbon"
+            countries["PR"] = "America/Puerto_Rico"
+            countries["RU"] = "Europe/Moscow"
+            countries["SE"] = "Europe/Stockholm"
+            countries["SG"] = "Asia/Singapore"
+            countries["TH"] = "Asia/Bangkok"
+            countries["TM"] = "Asia/Ashgabat"
+            countries["TN"] = "Africa/Tunis"
+            countries["TR"] = "Europe/Istanbul"
+            countries["TW"] = "Asia/Taipei"
+            countries["UK"] = "Europe/London"
+            countries["US"] = "America/New_York"
+            countries["UTC"] = "UTC"
+            countries["VA"] = "Europe/Vatican"
+            countries["VE"] = "America/Caracas"
+            countries["VN"] = "Asia/Ho_Chi_Minh"
+            countries["ZA"] = "Africa/Johannesburg"
+            countries["ZULU"] = "Zulu"
+            countries["INTERNET"] = BEATS_KEYWORD
+            countries["BEATS"] = BEATS_KEYWORD
+            ZoneId.getAvailableZoneIds().stream()
+                .filter { tz: String ->
+                    !tz.contains("/") && tz.length == 3 && !countries.containsKey(tz)
+                }
+                .forEach { tz: String ->
+                    countries[tz] = tz
+                }
+            COUNTRIES_MAP = Collections.unmodifiableMap(countries)
+        }
+    }
+
+    override fun commandResponse(
+        sender: String,
+        cmd: String,
+        args: String,
+        isPrivate: Boolean
+    ) {
+        with(bot) {
+            if (args.isEmpty()) {
+                send(sender, "The supported countries/zones are: ", isPrivate)
+                sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, false, false)
+            } else {
+                val msg = worldTime(args)
+                if (isPrivate) {
+                    send(sender, msg.msg, true)
+                } else {
+                    if (msg.isError) {
+                        send(sender, msg.msg, false)
+                    } else {
+                        send(msg.msg)
+                    }
+                }
+            }
+        }
+    }
+
+    override val isPrivateMsgEnabled = true
+
+    init {
+        help.add("To display a country's current date/time:")
+        help.add(Utils.helpIndent("%c $TIME_CMD") + " [<country code>]")
+        help.add("For a listing of the supported countries:")
+        help.add(Utils.helpIndent("%c $TIME_CMD"))
+        commands.add(TIME_CMD)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt b/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
index b353fe8..96ef549 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
@@ -1,5 +1,5 @@
 /*
- * ErrorMessage.java
+ * ErrorMessage.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -33,10 +33,6 @@ package net.thauvin.erik.mobibot.msg
 
 /**
  * The `ErrorMessage` class.
- *
- * @author [Erik C. Thauvin](https://erik.thauvin.net/)
- * @created 2019-04-07
- * @since 1.0
  */
 class ErrorMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
     init {
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
index d3fe758..a6f66f7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
@@ -35,10 +35,6 @@ import org.jibble.pircbot.Colors
 
 /**
  * The `Message` class.
- *
- * @author [Erik C. Thauvin](https://erik.thauvin.net/)
- * @created 2019-04-07
- * @since 1.0
  */
 open class Message {
     companion object {
@@ -67,12 +63,6 @@ open class Message {
 
     /**
      * Creates a new message.
-     *
-     * @param msg The message.
-     * @param color The color.
-     * @param isNotice The notice flag.
-     * @param isError The error flag.
-     * @param isPrivate The private flag.
      */
     @JvmOverloads
     constructor(msg: String, color: String = DEFAULT_COLOR, isNotice: Boolean, isError: Boolean, isPrivate: Boolean) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt b/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
index 3286d60..126fd91 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
@@ -1,5 +1,5 @@
 /*
- * NoticeMessage.java
+ * NoticeMessage.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -33,10 +33,6 @@ package net.thauvin.erik.mobibot.msg
 
 /**
  * The `NoticeMessage` class.
- *
- * @author [Erik C. Thauvin](https://erik.thauvin.net/)
- * @created 2019-04-07
- * @since 1.0
  */
 class NoticeMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
     init {
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt b/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
index 8eb4281..6bbade8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
@@ -1,5 +1,5 @@
 /*
- * PrivateMessage.java
+ * PrivateMessage.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -33,10 +33,6 @@ package net.thauvin.erik.mobibot.msg
 
 /**
  * The `PrivateMessage` class.
- *
- * @author [Erik C. Thauvin](https://erik.thauvin.net/)
- * @created 2019-04-09
- * @since 1.0
  */
 @Suppress("unused")
 class PrivateMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt b/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
index 3d2ac0f..384bc05 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
@@ -1,5 +1,5 @@
 /*
- * PublicMessage.java
+ * PublicMessage.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -33,10 +33,6 @@ package net.thauvin.erik.mobibot.msg
 
 /**
  * The `PublicMessage` class.
- *
- * @author [Erik C. Thauvin](https://erik.thauvin.net/)
- * @created 2019-04-07
- * @since 1.0
  */
 class PublicMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
     init {
diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java
index b754fbf..bde9d77 100644
--- a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java
@@ -66,7 +66,7 @@ public class UtilsTest {
 
     @Test
     public void testBold() {
-        assertThat(Utils.bold(1)).as("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD);
+        assertThat(Utils.bold(Integer.toString(1))).as("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD);
         assertThat(Utils.bold(ASCII)).as("bold(ascii").isEqualTo(Colors.BOLD + ASCII + Colors.BOLD);
     }
 
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.kt
similarity index 63%
rename from src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
rename to src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.kt
index 2f9b21e..643dbd6 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -1,5 +1,5 @@
 /*
- * CalcTest.java
+ * CalcTest.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -29,32 +29,26 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot.modules
 
-package net.thauvin.erik.mobibot.modules;
-
-import net.thauvin.erik.mobibot.Utils;
-import org.testng.annotations.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.modules.Calc.Companion.calc
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
 
 /**
- * The <code>CalcTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-07
- * @since 1.0
+ * The `CalcTest` class.
  */
-public class CalcTest {
+class CalcTest {
     @Test
-    public void testCalc() {
-        assertThat(Calc.calc("1 + 1")).as("calc(1+1)").isEqualTo("1+1 = %s", Utils.bold(2));
-        assertThat(Calc.calc("1 -3")).as("calc(1 -3)").isEqualTo("1-3 = %s", Utils.bold(-2));
-        assertThat(Calc.calc("pi+π+e+φ")).as("calc(pi+π+e+φ)").isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"));
-        assertThat(Calc.calc("one + one")).as("calc(one + one)").startsWith("No idea.");
-    }
-
-    @Test
-    public void testCalcImpl() {
-        AbstractModuleTest.testAbstractModule(new Calc(null));
+    fun testCalc() {
+        Assertions.assertThat(calc("1 + 1")).`as`("calc(1+1)")
+            .isEqualTo("1+1 = %s", Utils.bold(2))
+        Assertions.assertThat(calc("1 -3")).`as`("calc(1 -3)")
+            .isEqualTo("1-3 = %s", Utils.bold(-2))
+        Assertions.assertThat(calc("pi+π+e+φ")).`as`("calc(pi+π+e+φ)")
+            .isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"))
+        Assertions.assertThat(calc("one + one")).`as`("calc(one + one)")
+            .startsWith("No idea.")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
deleted file mode 100644
index b67fd6f..0000000
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * CurrencyConverterTest.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * The <code>CurrencyConvertTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-07
- * @since 1.0
- */
-public class CurrencyConverterTest {
-    @BeforeClass
-    public void before() throws ModuleException {
-        CurrencyConverter.loadRates();
-    }
-
-    @Test
-    @SuppressFBWarnings("PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS")
-    public void testConvertCurrency() {
-        assertThat(CurrencyConverter.convertCurrency("100 USD to EUR").getMsg())
-                .as("100 USD to EUR").matches("100\\.00 USD = \\d{2,3}\\.\\d{2} EUR");
-        assertThat(CurrencyConverter.convertCurrency("100 USD to USD").getMsg())
-                .as("100 USD to USD").contains("You're kidding, right?");
-        assertThat(CurrencyConverter.convertCurrency("100 USD").getMsg())
-                .as("100 USD").contains("Invalid query.");
-        assertThat(CurrencyConverter.currencyRates().size())
-                .as("currencyRates().size() == 33").isEqualTo(33);
-        assertThat(CurrencyConverter.currencyRates())
-                .as("currencyRates().get(EUR)").contains("  EUR:        1");
-    }
-
-    @Test
-    public void testCurrencyConvertererImpl() {
-        AbstractModuleTest.testAbstractModule(new CurrencyConverter(null));
-    }
-}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
similarity index 56%
rename from src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.java
rename to src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
index 6b1b7c4..edcbb65 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
@@ -1,5 +1,5 @@
 /*
- * LookupTest.java
+ * CurrencyConverterTest.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -29,40 +29,36 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot.modules
 
-package net.thauvin.erik.mobibot.modules;
-
-import org.testng.annotations.Test;
-
-import java.util.Arrays;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import net.thauvin.erik.mobibot.modules.CurrencyConverter.Companion.convertCurrency
+import net.thauvin.erik.mobibot.modules.CurrencyConverter.Companion.currencyRates
+import net.thauvin.erik.mobibot.modules.CurrencyConverter.Companion.loadRates
+import org.assertj.core.api.Assertions
+import org.testng.annotations.BeforeClass
+import org.testng.annotations.Test
 
 /**
- * The <code>Lookup Test</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2017-05-30
- * @since 1.0
+ * The `CurrencyConvertTest` class.
  */
-@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
-public class LookupTest {
-    @Test
-    public void testLookupImpl() {
-        AbstractModuleTest.testAbstractModule(new Lookup(null));
+class CurrencyConverterTest {
+    @BeforeClass
+    @Throws(ModuleException::class)
+    fun before() {
+        loadRates()
     }
 
     @Test
-    public void testLookup() throws Exception {
-        final String result = Lookup.lookup("erik.thauvin.net");
-        assertThat(result).as("lookup(erik.thauvin.net/104.31.77.12)").contains("104.31.77.12");
-    }
-
-    @Test
-    public void testWhois() throws Exception {
-        final String[] result = Lookup.whois("17.178.96.59", Lookup.WHOIS_HOST);
-
-        assertThat(Arrays.stream(result).anyMatch(m -> m.contains("Apple Inc.")))
-            .as("whois(17.178.96.59/Apple Inc.").isTrue();
+    fun testConvertCurrency() {
+        Assertions.assertThat(convertCurrency("100 USD to EUR").msg)
+            .`as`("100 USD to EUR").matches("100\\.00 USD = \\d{2,3}\\.\\d{2} EUR")
+        Assertions.assertThat(convertCurrency("100 USD to USD").msg)
+            .`as`("100 USD to USD").contains("You're kidding, right?")
+        Assertions.assertThat(convertCurrency("100 USD").msg)
+            .`as`("100 USD").contains("Invalid query.")
+        Assertions.assertThat(currencyRates().size)
+            .`as`("currencyRates().size() == 33").isEqualTo(33)
+        Assertions.assertThat(currencyRates())
+            .`as`("currencyRates().get(EUR)").contains("  EUR:        1")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
new file mode 100644
index 0000000..6cc59a5
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
@@ -0,0 +1,52 @@
+/*
+ * DiceTest.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.modules
+
+
+import org.assertj.core.api.Assertions.assertThat
+import org.testng.annotations.Test
+
+class DiceTest {
+    @Test
+    fun testWinLoseOrTie() {
+        assertThat(
+            Dice.winLoseOrTie(6, 6)
+        ).`as`("6 vs. 6").isEqualTo(Dice.Result.TIE)
+        assertThat(
+            Dice.winLoseOrTie(6, 5)
+        ).`as`("6 vs. 5").isEqualTo(Dice.Result.WIN)
+        assertThat(
+            Dice.winLoseOrTie(5, 6)
+        ).`as`("5 vs. 6").isEqualTo(Dice.Result.LOSE)
+    }
+}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
deleted file mode 100644
index ecf0f0f..0000000
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * GoogleSearchTest.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.LocalProperties;
-import net.thauvin.erik.mobibot.msg.Message;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * The <code>GoogleSearchTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-08
- * @since 1.0
- */
-public class GoogleSearchTest extends LocalProperties {
-    @Test
-    public void testGoogleSearchImpl() {
-        AbstractModuleTest.testAbstractModule(new GoogleSearch(null));
-    }
-
-    @SuppressFBWarnings("LEST_LOST_EXCEPTION_STACK_TRACE")
-    @SuppressWarnings("PMD.PreserveStackTrace")
-    @Test
-    public void testSearchGoogle() throws ModuleException {
-        final String apiKey = getProperty(GoogleSearch.GOOGLE_API_KEY_PROP);
-        final String cseKey = getProperty(GoogleSearch.GOOGLE_CSE_KEY_PROP);
-        try {
-            List<Message> messages = GoogleSearch.searchGoogle("mobibot site:github.com", apiKey, cseKey);
-            assertThat(messages).as("mobibot results not empty").isNotEmpty();
-            assertThat(messages.get(0).getMsg()).as("found mobitopia").contains("mobibot");
-
-            messages = GoogleSearch.searchGoogle("aapl", apiKey, cseKey);
-            assertThat(messages).as("aapl results not empty").isNotEmpty();
-            assertThat(messages.get(0).getMsg()).as("found apple").containsIgnoringCase("apple");
-
-            assertThatThrownBy(() -> GoogleSearch.searchGoogle("test", "", "apiKey")).as("no API key").isInstanceOf(
-                    ModuleException.class).hasNoCause();
-
-            assertThatThrownBy(() -> GoogleSearch.searchGoogle("test", "apiKey", "")).as("no CSE API key").isInstanceOf(
-                    ModuleException.class).hasNoCause();
-
-            assertThatThrownBy(() -> GoogleSearch.searchGoogle("", "apikey", "apiKey")).as("no query").isInstanceOf(
-                    ModuleException.class).hasNoCause();
-        } catch (ModuleException e) {
-            // Avoid displaying api keys in CI logs
-            if ("true".equals(System.getenv("CI"))) {
-                throw new ModuleException(e.getDebugMessage(), e.getSanitizedMessage(apiKey, cseKey));
-            } else {
-                throw e;
-            }
-        }
-    }
-}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
new file mode 100644
index 0000000..b934b02
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -0,0 +1,72 @@
+/*
+ * GoogleSearchTest.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.LocalProperties
+import net.thauvin.erik.mobibot.modules.GoogleSearch.Companion.searchGoogle
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
+
+/**
+ * The `GoogleSearchTest` class.
+ */
+class GoogleSearchTest : LocalProperties() {
+    @Test
+    @Throws(ModuleException::class)
+    fun testSearchGoogle() {
+        val apiKey = getProperty(GoogleSearch.GOOGLE_API_KEY_PROP)
+        val cseKey = getProperty(GoogleSearch.GOOGLE_CSE_KEY_PROP)
+        try {
+            var messages = searchGoogle("mobibot site:github.com", apiKey, cseKey)
+            Assertions.assertThat(messages).`as`("mobibot results not empty").isNotEmpty
+            Assertions.assertThat(messages[0].msg).`as`("found mobitopia").contains("mobibot")
+            messages = searchGoogle("aapl", apiKey, cseKey)
+            Assertions.assertThat(messages).`as`("aapl results not empty").isNotEmpty
+            Assertions.assertThat(messages[0].msg).`as`("found apple").containsIgnoringCase("apple")
+            Assertions.assertThatThrownBy { searchGoogle("test", "", "apiKey") }
+                .`as`("no API key")
+                .isInstanceOf(ModuleException::class.java).hasNoCause()
+            Assertions.assertThatThrownBy { searchGoogle("test", "apiKey", "") }
+                .`as`("no CSE API key")
+                .isInstanceOf(ModuleException::class.java).hasNoCause()
+            Assertions.assertThatThrownBy { searchGoogle("", "apikey", "apiKey") }
+                .`as`("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
+        } catch (e: ModuleException) {
+            // Avoid displaying api keys in CI logs
+            if ("true" == System.getenv("CI")) {
+                throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey, cseKey))
+            } else {
+                throw e
+            }
+        }
+    }
+}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.kt
similarity index 69%
rename from src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
rename to src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.kt
index 9880241..5a2f221 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.kt
@@ -1,5 +1,5 @@
 /*
- * JokeTest.java
+ * JokeTest.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -29,29 +29,20 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot.modules
 
-package net.thauvin.erik.mobibot.modules;
-
-import org.testng.annotations.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import net.thauvin.erik.mobibot.modules.Joke.Companion.randomJoke
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
 
 /**
- * The <code>JokeTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-07
- * @since 1.0
+ * The `JokeTest` class.
  */
-public class JokeTest {
+class JokeTest {
     @Test
-    public void testJokeImpl() {
-        AbstractModuleTest.testAbstractModule(new Joke(null));
-    }
-
-    @Test
-    public void testRamdomJoke() throws ModuleException {
-        assertThat(Joke.randomJoke().getMsg().length() > 0).as("randomJoke() > 0").isTrue();
-        assertThat(Joke.randomJoke().getMsg()).as("randomJoke()").containsIgnoringCase("chuck");
+    @Throws(ModuleException::class)
+    fun testRamdomJoke() {
+        Assertions.assertThat(randomJoke().msg.isNotEmpty()).`as`("randomJoke() > 0").isTrue
+        Assertions.assertThat(randomJoke().msg).`as`("randomJoke()").containsIgnoringCase("chuck")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
similarity index 66%
rename from src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
rename to src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
index 5f862ca..303a377 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -1,5 +1,5 @@
 /*
- * WordTimeTest.java
+ * LookupTest.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -29,31 +29,30 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot.modules
 
-package net.thauvin.erik.mobibot.modules;
-
-import net.thauvin.erik.mobibot.Utils;
-import org.testng.annotations.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import net.thauvin.erik.mobibot.modules.Lookup.Companion.lookup
+import net.thauvin.erik.mobibot.modules.Lookup.Companion.whois
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
+import java.util.*
 
 /**
- * The <code>WordTimeTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-07
- * @since 1.0
+ * The `Lookup Test` class.
  */
-public class WordTimeTest {
+class LookupTest {
     @Test
-    public void testWorldTime() {
-        assertThat(WorldTime.worldTime("PST").getMsg()).as("PST").endsWith(Utils.bold("Los Angeles"));
-        assertThat(WorldTime.worldTime("BLAH").isError()).as("BLAH").isTrue();
-        assertThat(WorldTime.worldTime("BEATS").getMsg()).as("BEATS").contains("@");
+    @Throws(Exception::class)
+    fun testLookup() {
+        val result = lookup("erik.thauvin.net")
+        Assertions.assertThat(result).`as`("lookup(erik.thauvin.net/104.31.77.12)").contains("104.31.77.12")
     }
 
     @Test
-    public void testWorldTimeImpl() {
-        AbstractModuleTest.testAbstractModule(new Lookup(null));
+    @Throws(Exception::class)
+    fun testWhois() {
+        val result = whois("17.178.96.59", Lookup.WHOIS_HOST)
+        Assertions.assertThat(Arrays.stream(result).anyMatch { m: String -> m.contains("Apple Inc.") })
+            .`as`("whois(17.178.96.59/Apple Inc.").isTrue
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.java
index 46199c9..b7feb89 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.java
@@ -42,10 +42,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * The <code>ModuleExceptionTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-09
- * @since 1.0
  */
 public class ModuleExceptionTest {
     static final String debugMessage = "debugMessage";
@@ -53,13 +49,13 @@ public class ModuleExceptionTest {
 
     @DataProvider(name = "dp")
     Object[][] createData(final Method m) {
-        return new Object[][]{new Object[]{new ModuleException(debugMessage,
-                                                               message,
-                                                               new IOException("URL http://foobar.com"))},
-                              new Object[]{new ModuleException(debugMessage,
-                                                               message,
-                                                               new IOException("URL http://foobar.com?"))},
-                              new Object[]{new ModuleException(debugMessage, message)}};
+        return new Object[][]{ new Object[]{ new ModuleException(debugMessage,
+                                                                 message,
+                                                                 new IOException("URL http://foobar.com")) },
+                               new Object[]{ new ModuleException(debugMessage,
+                                                                 message,
+                                                                 new IOException("URL http://foobar.com?")) },
+                               new Object[]{ new ModuleException(debugMessage, message) } };
     }
 
     @Test(dataProvider = "dp")
@@ -78,7 +74,7 @@ public class ModuleExceptionTest {
         final ModuleException e = new ModuleException(debugMessage,
                                                       message,
                                                       new IOException(
-                                                          "URL http://foo.com?apiKey=" + apiKey + "&userID=me"));
+                                                              "URL http://foo.com?apiKey=" + apiKey + "&userID=me"));
         assertThat(e.getSanitizedMessage(apiKey)).as("sanitized url").contains("xxxxxxxxxx").doesNotContain(apiKey);
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.kt
similarity index 75%
rename from src/test/java/net/thauvin/erik/mobibot/modules/PingTest.java
rename to src/test/java/net/thauvin/erik/mobibot/modules/PingTest.kt
index 564f111..1b0c460 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.kt
@@ -1,5 +1,5 @@
 /*
- * PingTest.java
+ * PingTest.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -29,28 +29,25 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot.modules
 
-package net.thauvin.erik.mobibot.modules;
-
-import org.testng.annotations.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import net.thauvin.erik.mobibot.modules.Ping.Companion.randomPing
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
 
 /**
- * The <code>PingTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-07
- * @since 1.0
+ * The `PingTest` class.
  */
-public class PingTest {
+class PingTest {
     @Test
-    public void testPingImpl() {
-        AbstractModuleTest.testAbstractModule(new Ping(null));
+    fun testPingsArray() {
+        Assertions.assertThat(Ping.PINGS).`as`("Pings array is not empty.").isNotEmpty
     }
 
     @Test
-    public void testPingsArray() {
-        assertThat(Ping.PINGS).as("Pings array is not empty.").isNotEmpty();
+    fun testRandomPing() {
+        for (i in 0..9) {
+            Assertions.assertThat(randomPing()).`as`("Random ping $i").isIn(Ping.PINGS)
+        }
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
index 0429945..1c71cb0 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
@@ -32,7 +32,6 @@
 
 package net.thauvin.erik.mobibot.modules
 
-
 import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
deleted file mode 100644
index a8961c6..0000000
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * StockQuoteTest.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.LocalProperties;
-import net.thauvin.erik.mobibot.msg.Message;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * The <code>StockQuoteTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-07
- * @since 1.0
- */
-
-public class StockQuoteTest extends LocalProperties {
-    @SuppressFBWarnings("LEST_LOST_EXCEPTION_STACK_TRACE")
-    @SuppressWarnings("PMD.PreserveStackTrace")
-    @Test
-    public void testGetQuote() throws ModuleException {
-        final String apiKey = LocalProperties.getProperty(StockQuote.ALPHAVANTAGE_API_KEY_PROP);
-        try {
-            final List<Message> messages = StockQuote.getQuote("apple inc", apiKey);
-            assertThat(messages).as("response not empty").isNotEmpty();
-            assertThat(messages.get(0).getMsg()).as("same stock symbol").contains("AAPL").contains("Apple Inc.");
-
-            try {
-                StockQuote.getQuote("blahfoo", apiKey);
-            } catch (ModuleException e) {
-                assertThat(e.getMessage()).as("invalid symbol").containsIgnoringCase(StockQuote.INVALID_SYMBOL);
-            }
-
-            assertThatThrownBy(() -> StockQuote.getQuote("test", "")).as("no API key").isInstanceOf(
-                ModuleException.class).hasNoCause();
-
-            assertThatThrownBy(() -> StockQuote.getQuote("", "apikey")).as("no symbol").isInstanceOf(
-                ModuleException.class).hasNoCause();
-
-        } catch (ModuleException e) {
-            // Avoid displaying api keys in CI logs
-            if ("true".equals(System.getenv("CI"))) {
-                throw new ModuleException(e.getDebugMessage(), e.getSanitizedMessage(apiKey));
-            } else {
-                throw e;
-            }
-        }
-    }
-
-    @Test
-    public void testStockQuoteImpl() {
-        AbstractModuleTest.testAbstractModule(new StockQuote(null));
-    }
-}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
new file mode 100644
index 0000000..96cc1c1
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -0,0 +1,73 @@
+/*
+ * StockQuoteTest.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.LocalProperties
+import net.thauvin.erik.mobibot.modules.StockQuote.Companion.getQuote
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
+
+/**
+ * The `StockQuoteTest` class.
+ */
+class StockQuoteTest : LocalProperties() {
+    @Test
+    @Throws(ModuleException::class)
+    fun testGetQuote() {
+        val apiKey = getProperty(StockQuote.ALPHAVANTAGE_API_KEY_PROP)
+        try {
+            val messages = getQuote("apple inc", apiKey)
+            Assertions.assertThat(messages).`as`("response not empty").isNotEmpty
+            Assertions.assertThat(messages[0].msg).`as`("same stock symbol")
+                .isEqualTo("Symbol: AAPL [Apple Inc.]")
+            Assertions.assertThat(messages[1].msg).`as`("price label")
+                .startsWith("    Price:     ")
+            try {
+                getQuote("blahfoo", apiKey)
+            } catch (e: ModuleException) {
+                Assertions.assertThat(e.message).`as`("invalid symbol")
+                    .containsIgnoringCase(StockQuote.INVALID_SYMBOL)
+            }
+            Assertions.assertThatThrownBy { getQuote("test", "") }.`as`("no API key")
+                .isInstanceOf(ModuleException::class.java).hasNoCause()
+            Assertions.assertThatThrownBy { getQuote("", "apikey") }.`as`("no symbol")
+                .isInstanceOf(ModuleException::class.java).hasNoCause()
+        } catch (e: ModuleException) {
+            // Avoid displaying api keys in CI logs
+            if ("true" == System.getenv("CI")) {
+                throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey))
+            } else {
+                throw e
+            }
+        }
+    }
+}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.kt
similarity index 62%
rename from src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
rename to src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.kt
index 2c14d2b..da9b26a 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.kt
@@ -1,5 +1,5 @@
 /*
- * TwitterTest.java
+ * TwitterTest.kt
  *
  * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -29,50 +29,43 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot.modules
 
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.LocalProperties;
-import org.testng.annotations.Test;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import net.thauvin.erik.mobibot.LocalProperties
+import net.thauvin.erik.mobibot.modules.Twitter.Companion.twitterPost
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
+import java.net.InetAddress
+import java.net.UnknownHostException
 
 /**
- * The <code>TwitterTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-19
- * @since 1.0
+ * The `TwitterTest` class.
  */
-public class TwitterTest extends LocalProperties {
-    @SuppressFBWarnings("MDM")
-    private String getCi() {
-        final String ciName = System.getenv("CI_NAME");
-        if (ciName != null) {
-            return ciName;
-        } else {
-            try {
-                return InetAddress.getLocalHost().getHostName();
-            } catch (UnknownHostException e) {
-                return "Unknown Host";
+class TwitterTest : LocalProperties() {
+    private val ci: String
+        get() {
+            val ciName = System.getenv("CI_NAME")
+            return ciName ?: try {
+                InetAddress.getLocalHost().hostName
+            } catch (e: UnknownHostException) {
+                "Unknown Host"
             }
         }
-    }
 
     @Test
-    public void testPostTwitter() throws ModuleException {
-        final String msg = "Testing Twitter API from " + getCi();
-        assertThat(Twitter.twitterPost(
+    @Throws(ModuleException::class)
+    fun testPostTwitter() {
+        val msg = "Testing Twitter API from $ci"
+        Assertions.assertThat(
+            twitterPost(
                 getProperty(Twitter.CONSUMER_KEY_PROP),
                 getProperty(Twitter.CONSUMER_SECRET_PROP),
                 getProperty(Twitter.TOKEN_PROP),
                 getProperty(Twitter.TOKEN_SECRET_PROP),
                 getProperty(Twitter.HANDLE_PROP),
                 msg,
-                true).getMsg()).as("twitterPost(" + msg + ')').isEqualTo(msg);
+                true
+            ).msg
+        ).`as`("twitterPost($msg)").isEqualTo(msg)
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
deleted file mode 100644
index 6d8c15c..0000000
--- a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Weather2Test.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.aksingh.owmjapis.api.APIException;
-import net.thauvin.erik.mobibot.LocalProperties;
-import net.thauvin.erik.mobibot.msg.Message;
-import org.testng.annotations.Test;
-
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
-/**
- * The <code>Weather2Test</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-09
- * @since 1.0
- */
-public class Weather2Test extends LocalProperties {
-    @SuppressFBWarnings("PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS")
-    @Test
-    public void testWeather() throws ModuleException {
-        List<Message> messages = Weather2.getWeather("98204", getProperty(Weather2.OWM_API_KEY_PROP));
-        assertThat(messages.get(0).getMsg()).as("is Everett").contains("Everett").contains("US");
-        assertThat(messages.get(messages.size() - 1).getMsg()).as("is City Search").endsWith("98204%2CUS");
-
-        messages = Weather2.getWeather("London, UK", getProperty(Weather2.OWM_API_KEY_PROP));
-        assertThat(messages.get(0).getMsg()).as("is UK").contains("London").contains("UK");
-        assertThat(messages.get(messages.size() - 1).getMsg()).as("is City Code").endsWith("4517009");
-
-        assertThatThrownBy(() -> Weather2.getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP)))
-                .as("Montpellier not found").hasCauseInstanceOf(APIException.class);
-
-        assertThatThrownBy(() -> Weather2.getWeather("test", ""))
-                .as("no API key").isInstanceOf(ModuleException.class).hasNoCause();
-
-        messages = Weather2.getWeather("", "apikey");
-        assertThat(messages.get(0).isError()).as("no query").isTrue();
-
-    }
-
-    @Test
-    public void testWeather2Impl() {
-        AbstractModuleTest.testAbstractModule(new Weather2(null));
-    }
-}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt
new file mode 100644
index 0000000..4364585
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt
@@ -0,0 +1,60 @@
+/*
+ * Weather2Test.kt
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.aksingh.owmjapis.api.APIException
+import net.thauvin.erik.mobibot.LocalProperties
+import net.thauvin.erik.mobibot.modules.Weather2.Companion.getWeather
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
+
+/**
+ * The `Weather2Test` class.
+ */
+class Weather2Test : LocalProperties() {
+    @Test
+    @Throws(ModuleException::class)
+    fun testWeather() {
+        var messages = getWeather("98204", getProperty(Weather2.OWM_API_KEY_PROP))
+        Assertions.assertThat(messages[0].msg).`as`("is Everett").contains("Everett").contains("US")
+        Assertions.assertThat(messages[messages.size - 1].msg).`as`("is City Search").endsWith("98204%2CUS")
+        messages = getWeather("London, UK", getProperty(Weather2.OWM_API_KEY_PROP))
+        Assertions.assertThat(messages[0].msg).`as`("is UK").contains("London").contains("UK")
+        Assertions.assertThat(messages[messages.size - 1].msg).`as`("is City Code").endsWith("4517009")
+        Assertions.assertThatThrownBy { getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP)) }
+            .`as`("Montpellier not found").hasCauseInstanceOf(APIException::class.java)
+        Assertions.assertThatThrownBy { getWeather("test", "") }
+            .`as`("no API key").isInstanceOf(ModuleException::class.java).hasNoCause()
+        messages = getWeather("", "apikey")
+        Assertions.assertThat(messages[0].isError).`as`("no query").isTrue
+    }
+}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
new file mode 100644
index 0000000..b6a40aa
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -0,0 +1,49 @@
+/*
+ * WordTimeTest.kt
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.modules.WorldTime.Companion.worldTime
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
+
+/**
+ * The `WordTimeTest` class.
+ */
+class WordTimeTest {
+    @Test
+    fun testWorldTime() {
+        Assertions.assertThat(worldTime("PST").msg).`as`("PST").endsWith(Utils.bold("Los Angeles"))
+        Assertions.assertThat(worldTime("BLAH").isError).`as`("BLAH").isTrue
+        Assertions.assertThat(worldTime("BEATS").msg).`as`("BEATS").contains("@")
+    }
+}

From 550e7a0bfb92b398f3ed5103ecaa47207af3c83b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 2 Dec 2020 01:49:01 -0800
Subject: [PATCH 086/262] Version 0.8.0-beta+219

---
 .../java/net/thauvin/erik/mobibot/ReleaseInfo.java          | 6 +++---
 version.properties                                          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index b4d9e77..b3c36ca 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -13,14 +13,14 @@ import java.time.*;
  */
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
-    public static final String VERSION = "0.8.0-beta+125";
+    public static final String VERSION = "0.8.0-beta+219";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1606812548443L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1606902256759L), ZoneId.systemDefault());
 
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
-    public static final String BUILDMETA = "125";
+    public static final String BUILDMETA = "219";
     public static final String PRERELEASE = "beta";
 
     public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
diff --git a/version.properties b/version.properties
index ea8fc92..7e1d074 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Dec 01 00:49:06 PST 2020
-version.buildmeta=125
+#Wed Dec 02 01:44:16 PST 2020
+version.buildmeta=219
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+125
+version.semver=0.8.0-beta+219

From d83ce652e705daed76cd27206687f738ae2688d0 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 2 Dec 2020 14:20:53 -0800
Subject: [PATCH 087/262] Cleanup.

---
 .../java/net/thauvin/erik/mobibot/Utils.kt    | 26 +++++++++++--------
 .../erik/mobibot/modules/GoogleSearch.kt      |  4 +--
 .../thauvin/erik/mobibot/modules/Lookup.kt    |  4 ++-
 .../erik/mobibot/modules/ModuleException.kt   | 15 +++++++----
 .../erik/mobibot/modules/StockQuote.kt        |  4 +--
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  8 +++---
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  3 +--
 .../erik/mobibot/modules/GoogleSearchTest.kt  |  2 +-
 .../erik/mobibot/modules/StockQuoteTest.kt    |  2 +-
 9 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index c1cae4b..e14f1eb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -76,7 +76,7 @@ class Utils private constructor() {
          */
         @JvmStatic
         fun colorize(s: String?, color: String): String {
-            if (s == null) {
+            if (s.isNullOrBlank()) {
                 return Colors.NORMAL
             } else if (Colors.BOLD == color || Colors.REVERSE == color) {
                 return color + s + color
@@ -95,7 +95,7 @@ class Utils private constructor() {
         /**
          * URL encodes the given string.
          */
-        fun encodeUrl(s: String?): String {
+        fun encodeUrl(s: String): String {
             return URLEncoder.encode(s, StandardCharsets.UTF_8)
         }
 
@@ -127,11 +127,15 @@ class Utils private constructor() {
          * Returns a property as an int.
          */
         @JvmStatic
-        fun getIntProperty(property: String, def: Int): Int {
-            return try {
-                property.toInt()
-            } catch (ignore: NumberFormatException) {
+        fun getIntProperty(property: String?, def: Int): Int {
+            return if (property == null) {
                 def
+            } else {
+                try {
+                    property.toInt()
+                } catch (ignore: NumberFormatException) {
+                    def
+                }
             }
         }
 
@@ -148,7 +152,7 @@ class Utils private constructor() {
          * nick.
          */
         @JvmStatic
-        fun helpFormat(text: String?, botNick: String, isPrivate: Boolean): String {
+        fun helpFormat(text: String, botNick: String, isPrivate: Boolean): String {
             val replace = arrayOf(if (isPrivate) "/msg $botNick" else "$botNick:", botNick)
             return StringUtils.replaceEach(text, searchFlags, replace)
         }
@@ -158,7 +162,7 @@ class Utils private constructor() {
          */
         @JvmStatic
         @JvmOverloads
-        fun helpIndent(help: String?, isBold: Boolean = true): String {
+        fun helpIndent(help: String, isBold: Boolean = true): String {
             return "      " + if (isBold) bold(help) else help
         }
 
@@ -182,8 +186,8 @@ class Utils private constructor() {
          * Obfuscates the given string.
          */
         @JvmStatic
-        fun obfuscate(s: String?): String {
-            return if (s!!.isNotBlank()) {
+        fun obfuscate(s: String): String {
+            return if (s.isNotBlank()) {
                 StringUtils.repeat('x', s.length)
             } else s
         }
@@ -228,7 +232,7 @@ class Utils private constructor() {
          * Converts XML/XHTML entities to plain text.
          */
         @JvmStatic
-        fun unescapeXml(str: String?): String {
+        fun unescapeXml(str: String): String {
             return Jsoup.parse(str).text()
         }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index b05a0cb..891a6f2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -87,10 +87,10 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
         @JvmStatic
         @Throws(ModuleException::class)
         fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List<Message> {
-            if (StringUtils.isBlank(apiKey) || StringUtils.isBlank(cseKey)) {
+            if (apiKey.isNullOrBlank() || cseKey.isNullOrBlank()) {
                 throw ModuleException("${StringUtils.capitalize(GOOGLE_CMD)} is disabled. The API keys are missing.")
             }
-            return if (StringUtils.isNotBlank(query)) {
+            return if (query.isNotBlank()) {
                 val results = ArrayList<Message>()
                 try {
                     val url = URL(
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
index cca419e..c46baf0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -52,7 +52,9 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
         if (args.matches("(\\S.)+(\\S)+".toRegex())) {
             with(bot) {
                 try {
-                    send(lookup(args))
+                    lookup(args).split(',').forEach {
+                        send(it.trim())
+                    }
                 } catch (ignore: UnknownHostException) {
                     if (args.matches(
                             ("(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
index 3b10ada..f9a3d81 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -67,12 +67,17 @@ class ModuleException : Exception {
     /**
      * Return the sanitized message (e.g. remove API keys, etc.)
      */
-    fun getSanitizedMessage(vararg sanitize: String?): String {
-        val obfuscate = arrayOfNulls<String>(sanitize.size)
-        for (i in sanitize.indices) {
-            obfuscate[i] = Utils.obfuscate(sanitize[i])
+    fun getSanitizedMessage(vararg sanitize: String): String {
+        val obfuscate = sanitize.map { Utils.obfuscate(it) }.toTypedArray()
+        return when {
+            cause != null -> {
+                cause.javaClass.name + ": " + StringUtils.replaceEach(cause.message, sanitize, obfuscate)
+            }
+            message != null -> {
+                message.javaClass.name + ": " + StringUtils.replaceEach(message, sanitize, obfuscate)
+            }
+            else -> ""
         }
-        return cause!!.javaClass.name + ": " + StringUtils.replaceEach(cause.message, sanitize, obfuscate)
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
index bcf1838..434ca54 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -122,10 +122,10 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
         @JvmStatic
         @Throws(ModuleException::class)
         fun getQuote(symbol: String, apiKey: String?): List<Message> {
-            if (StringUtils.isBlank(apiKey)) {
+            if (apiKey.isNullOrBlank()) {
                 throw ModuleException("${STOCK_CMD.capitalize()} is disabled. The API key is missing.")
             }
-            return if (StringUtils.isNotBlank(symbol)) {
+            return if (symbol.isNotBlank()) {
                 val debugMessage = "getQuote($symbol)"
                 val messages = ArrayList<Message>()
                 var response: String
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index 2dea6c7..d1dcf25 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -101,17 +101,17 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
         @JvmStatic
         @Throws(ModuleException::class)
         fun getWeather(query: String, apiKey: String?): List<Message> {
-            if (StringUtils.isBlank(apiKey)) {
+            if (apiKey.isNullOrBlank()) {
                 throw ModuleException("${WEATHER_CMD.capitalize()} is disabled. The API key is missing.")
             }
-            val owm = OWM(apiKey!!)
+            val owm = OWM(apiKey)
             val messages = ArrayList<Message>()
             owm.unit = OWM.Unit.IMPERIAL
-            if (StringUtils.isNotBlank(query)) {
+            if (query.isNotBlank()) {
                 val argv = query.split(",").toTypedArray()
                 if (argv.size in 1..2) {
                     val city = argv[0].trim()
-                    val country: String = if (argv.size > 1 && StringUtils.isNotBlank(argv[1])) {
+                    val country: String = if (argv.size > 1 && argv[1].isNotBlank()) {
                         argv[1].trim()
                     } else {
                         "US"
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 8ecc469..cafe903 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -36,7 +36,6 @@ import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.PublicMessage
-import org.apache.commons.lang3.StringUtils
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
@@ -72,7 +71,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
          */
         @JvmStatic
         fun worldTime(query: String): Message {
-            val tz = COUNTRIES_MAP[StringUtils.upperCase(query.substring(query.indexOf(' ') + 1).trim())]
+            val tz = COUNTRIES_MAP[(query.substring(query.indexOf(' ') + 1).trim()).toUpperCase()]
             val response: String = if (tz != null) {
                 if (BEATS_KEYWORD == tz) {
                     "The current Internet Time is: " + Utils.bold(internetTime() + ' ' + BEATS_KEYWORD)
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index b934b02..019538f 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -62,7 +62,7 @@ class GoogleSearchTest : LocalProperties() {
                 .`as`("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
-            if ("true" == System.getenv("CI")) {
+            if ("true" == System.getenv("CI") && !apiKey.isNullOrBlank() && !cseKey.isNullOrBlank()) {
                 throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey, cseKey))
             } else {
                 throw e
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index 96cc1c1..ea78c34 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -63,7 +63,7 @@ class StockQuoteTest : LocalProperties() {
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
-            if ("true" == System.getenv("CI")) {
+            if ("true" == System.getenv("CI") && !apiKey.isNullOrBlank()) {
                 throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey))
             } else {
                 throw e

From 310ffb91daeb12852322dfa54ad9bc3fddb30a06 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 2 Dec 2020 14:21:22 -0800
Subject: [PATCH 088/262] Version 0.8.0-beta+234

---
 .../java/net/thauvin/erik/mobibot/ReleaseInfo.java          | 6 +++---
 version.properties                                          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index b3c36ca..b548cec 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -13,14 +13,14 @@ import java.time.*;
  */
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
-    public static final String VERSION = "0.8.0-beta+219";
+    public static final String VERSION = "0.8.0-beta+234";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1606902256759L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1606946086512L), ZoneId.systemDefault());
 
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
-    public static final String BUILDMETA = "219";
+    public static final String BUILDMETA = "234";
     public static final String PRERELEASE = "beta";
 
     public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
diff --git a/version.properties b/version.properties
index 7e1d074..418f0b7 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed Dec 02 01:44:16 PST 2020
-version.buildmeta=219
+#Wed Dec 02 13:54:44 PST 2020
+version.buildmeta=234
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+219
+version.semver=0.8.0-beta+234

From 7759e278e89aa879ee8023aa045c8d0d817ce25e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 2 Dec 2020 22:57:25 -0800
Subject: [PATCH 089/262] Converter Entry Links manipulation classes to Kotlin.

---
 config/detekt/baseline.xml                    |   5 +
 .../net/thauvin/erik/mobibot/PinboardUtils.kt |  62 +--
 .../thauvin/erik/mobibot/commands/Cycle.kt    |  18 +-
 .../thauvin/erik/mobibot/commands/Modules.kt  |  16 +-
 .../erik/mobibot/commands/links/Comment.kt    |   4 +-
 .../erik/mobibot/commands/links/LinksMgr.kt   |   3 +-
 .../erik/mobibot/commands/links/Posting.kt    |   2 +-
 .../erik/mobibot/commands/tell/Tell.java      |   4 +-
 .../commands/tell/TellMessagesMgr.java        |   9 +-
 .../erik/mobibot/entries/EntriesMgr.java      | 331 --------------
 .../erik/mobibot/entries/EntriesMgr.kt        | 261 +++++++++++
 .../erik/mobibot/entries/EntriesUtils.java    | 120 -----
 .../erik/mobibot/entries/EntriesUtils.kt      |  83 ++++
 .../erik/mobibot/entries/EntryComment.java    | 130 ------
 .../erik/mobibot/entries/EntryComment.kt      |  54 +++
 .../erik/mobibot/entries/EntryLink.java       | 418 ------------------
 .../thauvin/erik/mobibot/entries/EntryLink.kt | 223 ++++++++++
 .../thauvin/erik/mobibot/modules/Twitter.kt   |   7 +-
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  14 +-
 ...ocalProperties.java => LocalProperties.kt} |  75 ++--
 .../erik/mobibot/entries/EntryLinkTest.java   | 100 -----
 .../erik/mobibot/entries/EntryLinkTest.kt     |  92 ++++
 22 files changed, 818 insertions(+), 1213 deletions(-)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
 rename src/test/java/net/thauvin/erik/mobibot/{LocalProperties.java => LocalProperties.kt} (57%)
 delete mode 100644 src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java
 create mode 100644 src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index ed4ec34..07b0938 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -2,7 +2,9 @@
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
+    <ID>ComplexMethod:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
     <ID>ComplexMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>LongMethod:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
     <ID>LongMethod:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
@@ -43,6 +45,9 @@
     <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.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
+    <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ @Throws(IOException::class, FeedException::class) fun loadEntries(file: String, channel: String, entries: ArrayList&lt;EntryLink&gt;): String</ID>
+    <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
+    <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ fun setTags(tags: List&lt;String?&gt;)</ID>
     <ID>NestedBlockDepth:FeedReader.kt$FeedReader$ override fun run()</ID>
     <ID>NestedBlockDepth:GoogleSearch.kt$GoogleSearch$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
diff --git a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
index 3456a8d..1dad880 100644
--- a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -44,17 +44,10 @@ import java.util.*
 
 /**
  * The class to handle posts to pinboard.in.
- *
- * @author [Erik C. Thauvin](https://erik.thauvin.net)
- * @created 2017-05-17
- * @since 1.0
  */
 object PinboardUtils {
     /**
      * Adds a pin.
-     *
-     * @param poster The PinboardPoster instance.
-     * @param entry The entry to add.
      */
     @JvmStatic
     fun addPin(poster: PinboardPoster, ircServer: String, entry: EntryLink) = runBlocking {
@@ -72,9 +65,6 @@ object PinboardUtils {
 
     /**
      * Deletes a pin.
-     *
-     * @param poster The PinboardPoster instance.
-     * @param entry The entry to delete.
      */
     @JvmStatic
     fun deletePin(poster: PinboardPoster, entry: EntryLink) = runBlocking {
@@ -86,33 +76,31 @@ object PinboardUtils {
 
     /**
      * Updates a pin.
-     *
-     * @param poster The PinboardPoster instance.
-     * @param oldUrl The old post URL.
-     * @param entry  The entry to add.
      */
     @JvmStatic
     fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) = runBlocking {
         val update = GlobalScope.async {
-            if (oldUrl != entry.link) {
-                poster.deletePin(oldUrl)
-                poster.addPin(
-                    entry.link,
-                    entry.title,
-                    postedBy(entry, ircServer),
-                    entry.pinboardTags,
-                    formatDate(entry.date)
-                )
-            } else {
-                poster.addPin(
-                    entry.link,
-                    entry.title,
-                    postedBy(entry, ircServer),
-                    entry.pinboardTags,
-                    formatDate(entry.date),
-                    replace = true,
-                    shared = true
-                )
+            with(entry) {
+                if (oldUrl != link) {
+                    poster.deletePin(oldUrl)
+                    poster.addPin(
+                        link,
+                        title,
+                        postedBy(entry, ircServer),
+                        pinboardTags,
+                        formatDate(date)
+                    )
+                } else {
+                    poster.addPin(
+                        link,
+                        title,
+                        postedBy(entry, ircServer),
+                        pinboardTags,
+                        formatDate(date),
+                        replace = true,
+                        shared = true
+                    )
+                }
             }
         }
         update.await()
@@ -120,19 +108,13 @@ object PinboardUtils {
 
     /**
      * Format a date to a UTC timestamp.
-     *
-     * @param date The date.
-     * @return The date in [DateTimeFormatter.ISO_INSTANT] format.
      */
     private fun formatDate(date: Date): String {
         return ZonedDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()).format(DateTimeFormatter.ISO_INSTANT)
     }
 
     /**
-     * Returns he pinboard.in extended attribution line.
-     *
-     * @param entry The entry.
-     * @return The extended attribution line.
+     * Returns the pinboard.in extended attribution line.
      */
     private fun postedBy(entry: EntryLink, ircServer: String): String {
         return "Posted by ${entry.nick} on ${entry.channel} ( $ircServer )"
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
index 1ca4ed2..525ad33 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -51,14 +51,16 @@ class Cycle(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        if (isOp) {
-            bot.send("$sender has just asked me to leave. I'll be back!")
-            bot.sleep(wait)
-            bot.partChannel(bot.channel)
-            bot.sleep(wait)
-            bot.joinChannel(bot.channel)
-        } else {
-            bot.helpDefault(sender, isOp, isPrivate)
+        with(bot) {
+            if (isOp) {
+                send("$sender has just asked me to leave. I'll be back!")
+                sleep(wait)
+                partChannel(channel)
+                sleep(wait)
+                joinChannel(channel)
+            } else {
+                helpDefault(sender, isOp, isPrivate)
+            }
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index af2f629..447552c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -52,17 +52,17 @@ class Modules(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        if (isOp) {
-            with(bot.modulesNames) {
-                if (isEmpty()) {
-                    bot.send(sender, "There are no enabled modules.", isPrivate)
+        with(bot) {
+            if (isOp) {
+                if (modulesNames.isEmpty()) {
+                    send(sender, "There are no enabled modules.", isPrivate)
                 } else {
-                    bot.send(sender, "The enabled modules are: ", isPrivate)
-                    bot.sendList(sender, this, 7, isPrivate, false)
+                    send(sender, "The enabled modules are: ", isPrivate)
+                    sendList(sender, modulesNames, 7, isPrivate, false)
                 }
+            } else {
+                helpDefault(sender, isOp, isPrivate)
             }
-        } else {
-            bot.helpDefault(sender, isOp, isPrivate)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 63f5ffa..00b718a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -71,7 +71,7 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
         if (index < LinksMgr.entriesCount) {
             val entry: EntryLink = LinksMgr.getEntry(index)
             val commentIndex = cmds[1].toInt() - 1
-            if (commentIndex < entry.commentsCount) {
+            if (commentIndex < entry.comments.size) {
                 when (val cmd = cmds[2].trim()) {
                     "" -> showComment(bot, entry, index, commentIndex) // L1.1:
                     "-" -> deleteComment(bot, sender, isOp, entry, index, commentIndex) // L11:-
@@ -140,7 +140,7 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
     ) {
         if (isOp || sender == entry.getComment(commentIndex).nick) {
             entry.deleteComment(commentIndex)
-            bot.send("Comment ${Constants.LINK_CMD}${index + 1}.${commentIndex + 1} removed.")
+            bot.send("Comment ${EntriesUtils.buildLinkCmd(index)}.${commentIndex + 1} removed.")
             LinksMgr.saveEntries(bot, false)
         } else {
             bot.send(sender, "Please ask a channel op to delete this comment for you.", false)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index 6db470a..ac5257d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -40,6 +40,7 @@ import net.thauvin.erik.mobibot.commands.Ignore
 import net.thauvin.erik.mobibot.entries.EntriesMgr
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
+import org.apache.logging.log4j.LogManager
 import org.jsoup.Jsoup
 import java.io.IOException
 
@@ -166,7 +167,7 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
                     bot.send(sender, "Please specify a title, by typing:", isPrivate)
                     bot.send(
                         sender,
-                        Utils.helpIndent(Constants.LINK_CMD + (index + 1) + ":|This is the title"),
+                        Utils.helpIndent("${EntriesUtils.buildLinkCmd(index)}:|This is the title"),
                         isPrivate
                     )
                 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 26a74ce..bf275f5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -137,7 +137,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
         if (entry.login == login || isOp) {
             bot.deletePin(index, entry)
             LinksMgr.removeEntry(index)
-            bot.send("Entry ${Constants.LINK_CMD}${index + 1} removed.")
+            bot.send("Entry ${EntriesUtils.buildLinkCmd(index)} removed.")
             LinksMgr.saveEntries(bot, false)
         } else {
             bot.send(sender, "Please ask a channel op to remove this entry for you.", false)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
index 8470320..d3fa026 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
@@ -104,7 +104,9 @@ public class Tell extends AbstractCommand {
      */
     @SuppressWarnings("WeakerAccess")
     final boolean clean() {
-        getBot().getLogger().debug("Cleaning the messages.");
+        if (getBot().getLogger().isDebugEnabled()) {
+            getBot().getLogger().debug("Cleaning the messages.");
+        }
         return TellMessagesMgr.clean(messages, maxDays);
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
index 6be49cd..98eed8a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
@@ -94,8 +94,9 @@ final class TellMessagesMgr {
         try {
             try (final ObjectInput input = new ObjectInputStream(
                     new BufferedInputStream(Files.newInputStream(Paths.get(file))))) {
-                logger.debug("Loading the messages.");
-
+                if (logger.isDebugEnabled()) {
+                    logger.debug("Loading the messages.");
+                }
                 return ((List<TellMessage>) input.readObject());
             }
         } catch (FileNotFoundException ignore) {
@@ -118,7 +119,9 @@ final class TellMessagesMgr {
         try {
             try (final BufferedOutputStream bos = new BufferedOutputStream(Files.newOutputStream(Paths.get(file)))) {
                 try (final ObjectOutput output = new ObjectOutputStream(bos)) {
-                    logger.debug("Saving the messages.");
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("Saving the messages.");
+                    }
                     output.writeObject(messages);
                 }
             }
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java
deleted file mode 100644
index 42c1fb9..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * EntriesMgr.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.entries;
-
-import com.rometools.rome.feed.synd.SyndContent;
-import com.rometools.rome.feed.synd.SyndContentImpl;
-import com.rometools.rome.feed.synd.SyndEntry;
-import com.rometools.rome.feed.synd.SyndEntryImpl;
-import com.rometools.rome.feed.synd.SyndFeed;
-import com.rometools.rome.feed.synd.SyndFeedImpl;
-import com.rometools.rome.io.FeedException;
-import com.rometools.rome.io.SyndFeedInput;
-import com.rometools.rome.io.SyndFeedOutput;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Manages the feed entries.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-28
- * @since 1.0
- */
-public final class EntriesMgr {
-    /**
-     * The name of the file containing the current entries.
-     */
-    public static final String CURRENT_XML = "current.xml";
-
-    /**
-     * The name of the file containing the backlog entries.
-     */
-    public static final String NAV_XML = "nav.xml";
-
-    /**
-     * The .xml extension
-     */
-    public static final String XML_EXT = ".xml";
-
-    // Maximum number of backlogs to keep
-    private static final int MAX_BACKLOGS = 10;
-
-    /**
-     * Disables the default constructor.
-     *
-     * @throws UnsupportedOperationException If the constructor is called.
-     */
-    private EntriesMgr() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
-
-    /**
-     * Loads the backlogs.
-     *
-     * @param file    The file containing the backlogs.
-     * @param history The history list.
-     * @throws IOException   If the file was not found or could not be read.
-     * @throws FeedException If an error occurred while reading the feed.
-     */
-    public static void loadBacklogs(final String file, final Collection<String> history)
-            throws IOException, FeedException {
-        history.clear();
-
-        final SyndFeedInput input = new SyndFeedInput();
-
-        try (final InputStreamReader reader =
-                     new InputStreamReader(Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8)) {
-
-            final SyndFeed feed = input.build(reader);
-
-            final List<SyndEntry> items = feed.getEntries();
-            SyndEntry item;
-
-            for (int i = items.size() - 1; i >= 0; i--) {
-                item = items.get(i);
-                history.add(item.getTitle());
-            }
-        }
-    }
-
-    /**
-     * Loads the current entries.
-     *
-     * @param file    The file containing the current entries.
-     * @param channel The channel
-     * @param entries The entries.
-     * @return The feed's last published date.
-     * @throws IOException   If the file was not found or could not be read.
-     * @throws FeedException If an error occurred while reading the feed.
-     */
-    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
-    public static String loadEntries(final String file, final String channel, final Collection<EntryLink> entries)
-            throws IOException, FeedException {
-        entries.clear();
-
-        final SyndFeedInput input = new SyndFeedInput();
-
-        final String today;
-
-        try (final InputStreamReader reader = new InputStreamReader(
-                Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8)) {
-            final SyndFeed feed = input.build(reader);
-
-            today = Utils.isoLocalDate(feed.getPublishedDate());
-
-            final List<SyndEntry> items = feed.getEntries();
-            SyndEntry item;
-            SyndContent description;
-            String[] comments;
-            String author;
-            EntryLink entry;
-
-            for (int i = items.size() - 1; i >= 0; i--) {
-                item = items.get(i);
-                author = item.getAuthor()
-                             .substring(item.getAuthor().lastIndexOf('(') + 1, item.getAuthor().length() - 1);
-                entry = new EntryLink(item.getLink(),
-                                      item.getTitle(),
-                                      author,
-                                      channel,
-                                      item.getPublishedDate(),
-                                      item.getCategories());
-                description = item.getDescription();
-                comments = description.getValue().split("<br/>");
-
-                int split;
-                for (final String comment : comments) {
-                    split = comment.indexOf(": ");
-
-                    if (split != -1) {
-                        entry.addComment(comment.substring(split + 2).trim(), comment.substring(0, split).trim());
-                    }
-                }
-
-                entries.add(entry);
-            }
-        }
-
-        return today;
-    }
-
-    /**
-     * Saves the entries.
-     *
-     * @param bot         The bot object.
-     * @param entries     The entries array.
-     * @param history     The history array.
-     * @param isDayBackup Set the true if the daily backup file should also be created.
-     */
-    @SuppressFBWarnings(value = { "CE_CLASS_ENVY", "CC_CYCLOMATIC_COMPLEXITY" },
-                        justification = "Yes, it does.")
-    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
-    public static void saveEntries(final Mobibot bot,
-                                   final List<EntryLink> entries,
-                                   final List<String> history,
-                                   final boolean isDayBackup) {
-        bot.getLogger().debug("Saving the feeds...");
-
-        if (StringUtils.isNotBlank(bot.getLogsDir()) && StringUtils.isNotBlank(bot.getWeblogUrl())) {
-            try {
-                final SyndFeedOutput output = new SyndFeedOutput();
-                SyndFeed rss = new SyndFeedImpl();
-                final List<SyndEntry> items = new ArrayList<>(0);
-                SyndEntry item;
-                SyndContent description;
-                try (final Writer fw = new OutputStreamWriter(
-                        Files.newOutputStream(Paths.get(bot.getLogsDir() + CURRENT_XML)), StandardCharsets.UTF_8)) {
-                    rss.setFeedType("rss_2.0");
-                    rss.setTitle(bot.getChannel() + " IRC Links");
-                    rss.setDescription("Links from " + bot.getIrcServer() + " on " + bot.getChannel());
-                    rss.setLink(bot.getWeblogUrl());
-                    rss.setPublishedDate(Calendar.getInstance().getTime());
-                    rss.setLanguage("en");
-
-                    EntryLink entry;
-                    StringBuilder buff;
-                    EntryComment comment;
-
-                    for (int i = (entries.size() - 1); i >= 0; --i) {
-                        entry = entries.get(i);
-
-                        buff = new StringBuilder()
-                                       .append("Posted by <b>")
-                                       .append(entry.getNick())
-                                       .append("</b> on <a href=\"irc://")
-                                       .append(bot.getIrcServer()).append('/')
-                                       .append(entry.getChannel())
-                                       .append("\"><b>")
-                                       .append(entry.getChannel())
-                                       .append("</b></a>");
-
-                        if (entry.getCommentsCount() > 0) {
-                            buff.append(" <br/><br/>");
-
-                            final EntryComment[] comments = entry.getComments();
-
-                            for (int j = 0; j < comments.length; j++) {
-                                comment = comments[j];
-
-                                if (j > 0) {
-                                    buff.append(" <br/>");
-                                }
-
-                                buff.append(comment.getNick()).append(": ").append(comment.getComment());
-                            }
-                        }
-
-                        item = new SyndEntryImpl();
-                        item.setLink(entry.getLink());
-                        description = new SyndContentImpl();
-                        description.setValue(buff.toString());
-                        item.setDescription(description);
-                        item.setTitle(entry.getTitle());
-                        item.setPublishedDate(entry.getDate());
-                        item.setAuthor(
-                                bot.getChannel().substring(1) + '@' + bot.getIrcServer() + " (" + entry.getNick()
-                                + ')');
-                        item.setCategories(entry.getTags());
-
-                        items.add(item);
-                    }
-
-                    rss.setEntries(items);
-
-                    bot.getLogger().debug("Writing the entries feed.");
-                    output.output(rss, fw);
-                }
-
-                try (final Writer fw = new OutputStreamWriter(
-                        Files.newOutputStream(Paths.get(
-                                bot.getLogsDir() + bot.getToday() + XML_EXT)), StandardCharsets.UTF_8)) {
-                    output.output(rss, fw);
-                }
-
-                if (isDayBackup) {
-                    if (StringUtils.isNotBlank(bot.getBacklogsUrl())) {
-                        if (!history.contains(bot.getToday())) {
-                            history.add(bot.getToday());
-
-                            while (history.size() > MAX_BACKLOGS) {
-                                history.remove(0);
-                            }
-                        }
-
-                        try (final Writer fw = new OutputStreamWriter(
-                                Files.newOutputStream(Paths.get(bot.getLogsDir() + NAV_XML)), StandardCharsets.UTF_8)) {
-                            rss = new SyndFeedImpl();
-                            rss.setFeedType("rss_2.0");
-                            rss.setTitle(bot.getChannel() + " IRC Links Backlogs");
-                            rss.setDescription("Backlogs of Links from " + bot.getIrcServer() + " on "
-                                               + bot.getChannel());
-                            rss.setLink(bot.getBacklogsUrl());
-                            rss.setPublishedDate(Calendar.getInstance().getTime());
-
-                            String date;
-                            items.clear();
-
-                            for (int i = (history.size() - 1); i >= 0; --i) {
-                                date = history.get(i);
-
-                                item = new SyndEntryImpl();
-                                item.setLink(bot.getBacklogsUrl() + date + ".xml");
-                                item.setTitle(date);
-                                description = new SyndContentImpl();
-                                description.setValue("Links for " + date);
-                                item.setDescription(description);
-
-                                items.add(item);
-                            }
-
-                            rss.setEntries(items);
-
-                            bot.getLogger().debug("Writing the backlog feed.");
-                            output.output(rss, fw);
-                        }
-                    } else {
-                        bot.getLogger().warn("Unable to generate the backlogs feed. No property configured.");
-                    }
-                }
-            } catch (FeedException | IOException e) {
-                bot.getLogger().warn("Unable to generate the entries feed.", e);
-            }
-        } else {
-            bot.getLogger().warn("Unable to generate the entries feed. A required property is missing.");
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
new file mode 100644
index 0000000..a526542
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -0,0 +1,261 @@
+/*
+ * EntriesMgr.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.entries
+
+import com.rometools.rome.feed.synd.SyndContentImpl
+import com.rometools.rome.feed.synd.SyndEntry
+import com.rometools.rome.feed.synd.SyndEntryImpl
+import com.rometools.rome.feed.synd.SyndFeed
+import com.rometools.rome.feed.synd.SyndFeedImpl
+import com.rometools.rome.io.FeedException
+import com.rometools.rome.io.SyndFeedInput
+import com.rometools.rome.io.SyndFeedOutput
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.Companion.isoLocalDate
+import org.apache.commons.lang3.StringUtils
+import java.io.IOException
+import java.io.InputStreamReader
+import java.io.OutputStreamWriter
+import java.nio.charset.StandardCharsets
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.*
+import kotlin.collections.ArrayList
+
+/**
+ * Manages the feed entries.
+ */
+class EntriesMgr private constructor() {
+
+
+    companion object {
+        /**
+         * The name of the file containing the current entries.
+         */
+        const val CURRENT_XML = "current.xml"
+
+        /**
+         * The name of the file containing the backlog entries.
+         */
+        const val NAV_XML = "nav.xml"
+
+        /**
+         * The .xml extension
+         */
+        const val XML_EXT = ".xml"
+
+        // Maximum number of backlogs to keep
+        private const val MAX_BACKLOGS = 10
+
+        /**
+         * Loads the backlogs.
+         */
+        @Throws(IOException::class, FeedException::class)
+        fun loadBacklogs(file: String, history: ArrayList<String>) {
+            history.clear()
+            val input = SyndFeedInput()
+            InputStreamReader(Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8).use { reader ->
+                val feed = input.build(reader)
+                val items = feed.entries
+                for (i in items.indices.reversed()) {
+                    history.add(items[i].title)
+                }
+            }
+        }
+
+        /**
+         * Loads the current entries.
+         */
+        @Throws(IOException::class, FeedException::class)
+        fun loadEntries(file: String, channel: String, entries: ArrayList<EntryLink>): String {
+            entries.clear()
+            val input = SyndFeedInput()
+            var today: String
+            InputStreamReader(
+                Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8
+            ).use { reader ->
+                val feed = input.build(reader)
+                today = isoLocalDate(feed.publishedDate)
+                val items = feed.entries
+                var entry: EntryLink
+                for (i in items.indices.reversed()) {
+                    with(items[i]) {
+                        entry = EntryLink(
+                            link,
+                            title,
+                            author.substring(author.lastIndexOf('(') + 1, author.length - 1),
+                            channel,
+                            publishedDate,
+                            categories
+                        )
+                        var split: List<String>
+                        for (comment in description.value.split("<br/>")) {
+                            split = comment.split(": ".toRegex(), 2)
+                            if (split.size == 2) {
+                                entry.addComment(comment = split[1].trim(), nick = split[0].trim())
+                            }
+                        }
+                    }
+                    entries.add(entry)
+                }
+            }
+            return today
+        }
+
+        /**
+         * Saves the entries.
+         */
+        fun saveEntries(
+            bot: Mobibot,
+            entries: List<EntryLink>,
+            history: MutableList<String>,
+            isDayBackup: Boolean
+        ) {
+            if (bot.logger.isDebugEnabled) {
+                bot.logger.debug("Saving the feeds...")
+            }
+            if (StringUtils.isNotBlank(bot.logsDir) && StringUtils.isNotBlank(bot.weblogUrl)) {
+                try {
+                    val output = SyndFeedOutput()
+                    var rss: SyndFeed = SyndFeedImpl()
+                    val items: MutableList<SyndEntry> = ArrayList(0)
+                    var item: SyndEntry
+                    OutputStreamWriter(
+                        Files.newOutputStream(Paths.get(bot.logsDir + CURRENT_XML)), StandardCharsets.UTF_8
+                    ).use { fw ->
+                        rss.apply {
+                            feedType = "rss_2.0"
+                            title = bot.channel + " IRC Links"
+                            description = "Links from ${bot.ircServer} on ${bot.channel}"
+                            link = bot.weblogUrl
+                            publishedDate = Calendar.getInstance().time
+                            language = "en"
+                        }
+                        var buff: StringBuilder
+                        var comment: EntryComment
+                        for (i in entries.size - 1 downTo 0) {
+                            with(entries[i]) {
+                                buff = StringBuilder()
+                                    .append("Posted by <b>")
+                                    .append(nick)
+                                    .append("</b> on <a href=\"irc://")
+                                    .append(bot.ircServer).append('/')
+                                    .append(channel)
+                                    .append("\"><b>")
+                                    .append(channel)
+                                    .append("</b></a>")
+                                if (comments.size > 0) {
+                                    buff.append(" <br/><br/>")
+                                    val comments = comments
+                                    for (j in comments.indices) {
+                                        comment = comments[j]
+                                        if (j > 0) {
+                                            buff.append(" <br/>")
+                                        }
+                                        buff.append(comment.nick).append(": ").append(comment.comment)
+                                    }
+                                }
+                                item = SyndEntryImpl()
+                                item.link = link
+                                item.description = SyndContentImpl().apply { value = buff.toString() }
+                                item.title = title
+                                item.publishedDate = date
+                                item.author = "${bot.channel.substring(1)}@${bot.ircServer} ($nick)"
+                                item.categories = tags
+                                items.add(item)
+                            }
+                        }
+                        rss.entries = items
+                        if (bot.logger.isDebugEnabled) {
+                            bot.logger.debug("Writing the entries feed.")
+                        }
+                        output.output(rss, fw)
+                    }
+                    OutputStreamWriter(
+                        Files.newOutputStream(
+                            Paths.get(
+                                bot.logsDir + bot.today + XML_EXT
+                            )
+                        ), StandardCharsets.UTF_8
+                    ).use { fw -> output.output(rss, fw) }
+                    if (isDayBackup) {
+                        if (StringUtils.isNotBlank(bot.backlogsUrl)) {
+                            if (!history.contains(bot.today)) {
+                                history.add(bot.today)
+                                while (history.size > MAX_BACKLOGS) {
+                                    history.removeAt(0)
+                                }
+                            }
+                            OutputStreamWriter(
+                                Files.newOutputStream(Paths.get(bot.logsDir + NAV_XML)), StandardCharsets.UTF_8
+                            ).use { fw ->
+                                rss = SyndFeedImpl()
+                                rss.apply {
+                                    feedType = "rss_2.0"
+                                    title = "${bot.channel} IRC Links Backlogs"
+                                    description = "Backlogs of Links from ${bot.ircServer} on ${bot.channel}"
+                                    link = bot.backlogsUrl
+                                    publishedDate = Calendar.getInstance().time
+                                }
+                                var date: String
+                                items.clear()
+                                for (i in history.size - 1 downTo 0) {
+                                    date = history[i]
+                                    item = SyndEntryImpl()
+                                    item.apply {
+                                        link = bot.backlogsUrl + date + ".xml"
+                                        title = date
+                                        description = SyndContentImpl().apply { value = "Links for $date" }
+                                    }
+                                    items.add(item)
+                                }
+                                rss.entries = items
+                                if (bot.logger.isDebugEnabled) {
+                                    bot.logger.debug("Writing the backlog feed.")
+                                }
+                                output.output(rss, fw)
+                            }
+                        } else {
+                            bot.logger.warn("Unable to generate the backlogs feed. No property configured.")
+                        }
+                    }
+                } catch (e: FeedException) {
+                    bot.logger.warn("Unable to generate the entries feed.", e)
+                } catch (e: IOException) {
+                    bot.logger.warn("Unable to generate the entries feed.", e)
+                }
+            } else {
+                bot.logger.warn("Unable to generate the entries feed. A required property is missing.")
+            }
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
deleted file mode 100644
index e114d66..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * EntriesUtils.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.entries;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.Constants;
-import net.thauvin.erik.mobibot.Utils;
-
-/**
- * The <code>Utils</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-19
- * @since 1.0
- */
-public final class EntriesUtils {
-    /**
-     * Disables the default constructor.
-     */
-    private EntriesUtils() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
-
-    /**
-     * Builds an entry's comment for display on the channel.
-     *
-     * @param entryIndex   The entry's index.
-     * @param commentIndex The comment's index.
-     * @param comment      The {@link EntryComment comment} object.
-     * @return The entry's comment.
-     */
-    public static String buildComment(final int entryIndex, final int commentIndex, final EntryComment comment) {
-        return (Constants.LINK_CMD + (entryIndex + 1) + '.' + (commentIndex + 1) + ": [" + comment.getNick() + "] "
-                + comment.getComment());
-    }
-
-    /**
-     * Builds an entry's link for display on the channel.
-     *
-     * @param index The entry's index.
-     * @param entry The {@link EntryLink entry} object.
-     * @return The entry's link.
-     * @see #buildLink(int, EntryLink, boolean)
-     */
-    public static String buildLink(final int index, final EntryLink entry) {
-        return buildLink(index, entry, false);
-    }
-
-    /**
-     * Builds an entry's link for display on the channel.
-     *
-     * @param index  The entry's index.
-     * @param entry  The {@link EntryLink entry} object.
-     * @param isView Set to true to display the number of comments.
-     * @return The entry's link.
-     */
-    @SuppressFBWarnings(value = "CE_CLASS_ENVY",
-                        justification = "Yes, it does.")
-    public static String buildLink(final int index, final EntryLink entry, final boolean isView) {
-        final StringBuilder buff = new StringBuilder().append(Constants.LINK_CMD).append(index + 1)
-                                                      .append(": ").append('[').append(entry.getNick()).append(']');
-
-        if (isView && entry.hasComments()) {
-            buff.append("[+").append(entry.getCommentsCount()).append(']');
-        }
-
-        buff.append(' ');
-
-        if (Constants.NO_TITLE.equals(entry.getTitle())) {
-            buff.append(entry.getTitle());
-        } else {
-            buff.append(Utils.bold(entry.getTitle()));
-        }
-
-        buff.append(" ( ").append(Utils.green(entry.getLink())).append(" )");
-
-        return buff.toString();
-    }
-
-    /**
-     * Build an entry's tags/categories for display on the channel.
-     *
-     * @param entryIndex The entry's index.
-     * @param entry      The {@link EntryLink entry} object.
-     * @return The entry's tags.
-     */
-    public static String buildTags(final int entryIndex, final EntryLink entry) {
-        return (Constants.LINK_CMD + (entryIndex + 1) + "T: " + entry.getPinboardTags().replace(",", ", "));
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
new file mode 100644
index 0000000..a96bad0
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -0,0 +1,83 @@
+/*
+ * EntriesUtils.kt
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.entries
+
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.Utils.Companion.bold
+import net.thauvin.erik.mobibot.Utils.Companion.green
+
+/**
+ * The `Utils` class.
+ */
+class EntriesUtils private constructor() {
+    companion object {
+        /**
+         * Build link cmd based on its index. e.g: L1
+         */
+        fun buildLinkCmd(index: Int): String = Constants.LINK_CMD + (index + 1)
+
+        /**
+         * Builds an entry's comment for display on the channel.
+         */
+        fun buildComment(entryIndex: Int, commentIndex: Int, comment: EntryComment): String =
+            (buildLinkCmd(entryIndex) + '.' + (commentIndex + 1) + ": [" + comment.nick + "] "
+                + comment.comment)
+
+        /**
+         * Builds an entry's link for display on the channel.
+         */
+        @JvmOverloads
+        fun buildLink(entryIndex: Int, entry: EntryLink, isView: Boolean = false): String {
+            val buff = StringBuilder().append(buildLinkCmd(entryIndex)).append(": ")
+                .append('[').append(entry.nick).append(']')
+            if (isView && entry.hasComments()) {
+                buff.append("[+").append(entry.comments.size).append(']')
+            }
+            buff.append(' ')
+            with(entry) {
+                if (Constants.NO_TITLE == title) {
+                    buff.append(title)
+                } else {
+                    buff.append(bold(title))
+                }
+                buff.append(" ( ").append(green(link)).append(" )")
+            }
+            return buff.toString()
+        }
+
+        /**
+         * Build an entry's tags/categories for display on the channel.
+         */
+        fun buildTags(entryIndex: Int, entry: EntryLink): String =
+            buildLinkCmd(entryIndex) + "T: " + entry.pinboardTags.replace(",", ", ")
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.java
deleted file mode 100644
index 5c51f1a..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * EntryComment.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.entries;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * The class used to store comments associated to a specific entry.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created Jan 31, 2004
- * @since 1.0
- */
-@SuppressWarnings({ "PMD.DataClass" })
-public class EntryComment implements Serializable {
-    // Serial version UID
-    static final long serialVersionUID = 1L;
-
-    // Creation date
-    private final LocalDateTime date = LocalDateTime.now();
-
-    private String comment = "";
-    private String nick = "";
-
-    /**
-     * Creates a new comment.
-     *
-     * @param comment The new comment.
-     * @param nick    The nickname of the comment's author.
-     */
-    public EntryComment(final String comment, final String nick) {
-        this.comment = comment;
-        this.nick = nick;
-    }
-
-    /**
-     * Creates a new comment.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    protected EntryComment() {
-        // Required for serialization
-    }
-
-    /**
-     * Returns the comment.
-     *
-     * @return The comment.
-     */
-    public final String getComment() {
-        return comment;
-    }
-
-    /**
-     * Returns the comment's creation date.
-     *
-     * @return The date.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    public final LocalDateTime getDate() {
-        return date;
-    }
-
-    /**
-     * Returns the nickname of the author of the comment.
-     *
-     * @return The nickname.
-     */
-    public final String getNick() {
-        return nick;
-    }
-
-    /**
-     * Sets the comment.
-     *
-     * @param comment The actual comment.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    public final void setComment(final String comment) {
-        this.comment = comment;
-    }
-
-    /**
-     * Sets the nickname of the author of the comment.
-     *
-     * @param nick The new nickname.
-     */
-    public final void setNick(final String nick) {
-        this.nick = nick;
-    }
-
-    @Override
-    public String toString() {
-        return "EntryComment{"
-               + "comment='" + comment + '\''
-               + ", date=" + date
-               + ", nick='" + nick + '\''
-               + '}';
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt
new file mode 100644
index 0000000..0052a0f
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt
@@ -0,0 +1,54 @@
+/*
+ * EntryComment.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.entries
+
+import java.io.Serializable
+import java.time.LocalDateTime
+
+/**
+ * Entry comments data class.
+ */
+data class EntryComment(var comment: String, var nick: String) : Serializable {
+    /**
+     * Creation date.
+     */
+    val date: LocalDateTime = LocalDateTime.now()
+
+    override fun toString(): String {
+        return ("EntryComment{comment='$comment', date=$date, nick='$nick'}")
+    }
+
+    companion object {
+        // Serial version UID
+        const val serialVersionUID = 1L
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
deleted file mode 100644
index ba9a3f5..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * EntryLink.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.entries;
-
-import com.rometools.rome.feed.synd.SyndCategory;
-import com.rometools.rome.feed.synd.SyndCategoryImpl;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.commands.links.LinksMgr;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.Serializable;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * The class used to store link entries.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created Jan 31, 2004
- * @since 1.0
- */
-public class EntryLink implements Serializable {
-    // Serial version UID
-    static final long serialVersionUID = 1L;
-
-    // Link's comments
-    private final List<EntryComment> comments = new CopyOnWriteArrayList<>();
-
-    // Tags/categories
-    private final List<SyndCategory> tags = new CopyOnWriteArrayList<>();
-
-    // Channel
-    private String channel;
-
-    // Creation date
-    private Date date = Calendar.getInstance().getTime();
-
-    // Link's URL
-    private String link;
-
-    // Author's login
-    private String login = "";
-
-    // Author's nickname
-    private String nick;
-
-    // Link's title
-    private String title;
-
-    /**
-     * Creates a new entry.
-     *
-     * @param link    The new entry's link.
-     * @param title   The new entry's title.
-     * @param nick    The nickname of the author of the link.
-     * @param login   The login of the author of the link.
-     * @param channel The channel.
-     * @param tags    The entry's tags/categories.
-     */
-    public EntryLink(final String link,
-                     final String title,
-                     final String nick,
-                     final String login,
-                     final String channel,
-                     final List<String> tags) {
-        this.link = link;
-        this.title = title;
-        this.nick = nick;
-        this.login = login;
-        this.channel = channel;
-
-        setTags(tags);
-    }
-
-    /**
-     * Creates a new entry.
-     *
-     * @param link    The new entry's link.
-     * @param title   The new entry's title.
-     * @param nick    The nickname of the author of the link.
-     * @param channel The channel.
-     * @param date    The entry date.
-     * @param tags    The entry's tags/categories.
-     */
-    public EntryLink(final String link,
-                     final String title,
-                     final String nick,
-                     final String channel,
-                     final Date date,
-                     final List<SyndCategory> tags) {
-        this.link = link;
-        this.title = title;
-        this.nick = nick;
-        this.channel = channel;
-        this.date = new Date(date.getTime());
-        this.tags.addAll(tags);
-    }
-
-    /**
-     * Adds a new comment.
-     *
-     * @param comment The actual comment.
-     * @param nick    The nickname of the author of the comment.
-     * @return The total number of comments for this entry.
-     */
-    public final int addComment(final String comment, final String nick) {
-        comments.add(new EntryComment(comment, nick));
-
-        return (comments.size() - 1);
-    }
-
-    /**
-     * Deletes a specific comment.
-     *
-     * @param index The index of the comment to delete.
-     */
-    public final void deleteComment(final int index) {
-        if (index < comments.size()) {
-            comments.remove(index);
-        }
-    }
-
-    /**
-     * Returns the channel the link was posted on.
-     *
-     * @return The channel
-     */
-    public final String getChannel() {
-        return channel;
-    }
-
-    /**
-     * Returns a comment.
-     *
-     * @param index The comment's index.
-     * @return The specific comment.
-     */
-    public final EntryComment getComment(final int index) {
-        return (comments.get(index));
-    }
-
-    /**
-     * Returns all the comments.
-     *
-     * @return The comments.
-     */
-    public final EntryComment[] getComments() {
-        return (comments.toArray(new EntryComment[0]));
-    }
-
-    /**
-     * Returns the total number of comments.
-     *
-     * @return The count of comments.
-     */
-    public final int getCommentsCount() {
-        return comments.size();
-    }
-
-    /**
-     * Returns the comment's creation date.
-     *
-     * @return The date.
-     */
-    public final Date getDate() {
-        return new Date(date.getTime());
-    }
-
-    /**
-     * Returns the comment's link.
-     *
-     * @return The link.
-     */
-    public final String getLink() {
-        return link;
-    }
-
-    /**
-     * Returns the comment's author login.
-     *
-     * @return The login;
-     */
-    public final String getLogin() {
-        return login;
-    }
-
-    /**
-     * Returns the comment's author nickname.
-     *
-     * @return The nickname.
-     */
-    public final String getNick() {
-        return nick;
-    }
-
-    /**
-     * Returns the tags formatted for pinboard.in
-     *
-     * @return The tags as a comma-delimited string.
-     */
-    public final String getPinboardTags() {
-        final StringBuilder pinboardTags = new StringBuilder(nick);
-
-        for (final SyndCategory tag : tags) {
-            pinboardTags.append(',');
-            pinboardTags.append(tag.getName());
-        }
-
-        return pinboardTags.toString();
-    }
-
-    /**
-     * Returns the tags.
-     *
-     * @return The tags.
-     */
-    public final List<SyndCategory> getTags() {
-        return tags;
-    }
-
-    /**
-     * Returns the comment's title.
-     *
-     * @return The title.
-     */
-    public final String getTitle() {
-        return title;
-    }
-
-    /**
-     * Returns true if the entry has comments.
-     *
-     * @return true if there are comments, false otherwise.
-     */
-    public final boolean hasComments() {
-        return !comments.isEmpty();
-    }
-
-    /**
-     * Returns true if the entry has tags.
-     *
-     * @return true if there are tags, false otherwise.
-     */
-    public final boolean hasTags() {
-        return !tags.isEmpty();
-    }
-
-    /**
-     * Returns true if a string is contained in the link, title, or nick.
-     *
-     * @param match The string to match.
-     * @return {@code true} if matched, {@code false} otherwise.
-     */
-    public Boolean matches(final String match) {
-        return (StringUtils.containsIgnoreCase(link, match)
-                || StringUtils.containsIgnoreCase(title, match)
-                || StringUtils.containsIgnoreCase(nick, match));
-    }
-
-    /**
-     * Sets the channel.
-     *
-     * @param channel The channel.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    public final void setChannel(final String channel) {
-        this.channel = channel;
-    }
-
-    /**
-     * /** Sets a comment.
-     *
-     * @param index   The comment's index.
-     * @param comment The actual comment.
-     * @param nick    The nickname of the author of the comment.
-     */
-    public final void setComment(final int index, final String comment, final String nick) {
-        if (index < comments.size()) {
-            comments.set(index, new EntryComment(comment, nick));
-        }
-    }
-
-    /**
-     * Sets the comment's link.
-     *
-     * @param link The new link.
-     */
-    public final void setLink(final String link) {
-        this.link = link;
-    }
-
-    /**
-     * Sets the comment's author login.
-     *
-     * @param login The new login.
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    public final void setLogin(final String login) {
-        this.login = login;
-    }
-
-    /**
-     * Sets the comment's author nickname.
-     *
-     * @param nick The new nickname.
-     */
-    public final void setNick(final String nick) {
-        this.nick = nick;
-    }
-
-    /**
-     * Sets the tags.
-     *
-     * @param tags The space-delimited tags.
-     */
-    public final void setTags(final String tags) {
-        setTags(Arrays.asList(tags.split(LinksMgr.TAG_MATCH)));
-    }
-
-    /**
-     * Sets the tags.
-     *
-     * @param tags The tags list.
-     */
-    @SuppressFBWarnings("STT_STRING_PARSING_A_FIELD")
-    @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
-    public final void setTags(final List<String> tags) {
-        if (!tags.isEmpty()) {
-            SyndCategoryImpl category;
-
-            for (final String tag : tags) {
-                if (StringUtils.isNoneBlank(tag)) {
-                    final String t = StringUtils.lowerCase(tag);
-                    final char mod = t.charAt(0);
-                    if (mod == '-') {
-                        // Don't remove the channel tag
-                        if (!channel.substring(1).equals(t.substring(1))) {
-                            category = new SyndCategoryImpl();
-                            category.setName(t.substring(1));
-                            this.tags.remove(category);
-                        }
-                    } else {
-                        category = new SyndCategoryImpl();
-                        if (mod == '+') {
-                            category.setName(t.substring(1));
-                        } else {
-                            category.setName(t);
-                        }
-                        if (!this.tags.contains(category)) {
-                            this.tags.add(category);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Sets the comment's title.
-     *
-     * @param title The new title.
-     */
-    public final void setTitle(final String title) {
-        this.title = title;
-    }
-
-    /**
-     * Returns a string representation of the object.
-     *
-     * @return A string representation of the object.
-     */
-    @Override
-    public String toString() {
-        return "EntryLink{"
-               + "channel='" + channel + '\''
-               + ", comments=" + comments
-               + ", date=" + date
-               + ", link='" + link + '\''
-               + ", login='" + login + '\''
-               + ", nick='" + nick + '\''
-               + ", tags=" + tags
-               + ", title='" + title + '\''
-               + '}';
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
new file mode 100644
index 0000000..9601d17
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -0,0 +1,223 @@
+/*
+ * EntryLink.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.entries
+
+import com.rometools.rome.feed.synd.SyndCategory
+import com.rometools.rome.feed.synd.SyndCategoryImpl
+import net.thauvin.erik.mobibot.commands.links.LinksMgr
+import org.apache.commons.lang3.StringUtils
+import java.io.Serializable
+import java.util.*
+import java.util.concurrent.CopyOnWriteArrayList
+
+/**
+ * The class used to store link entries.
+ */
+class EntryLink : Serializable {
+    // Link's comments
+    val comments: MutableList<EntryComment> = CopyOnWriteArrayList()
+
+    // Tags/categories
+    val tags: MutableList<SyndCategory> = CopyOnWriteArrayList()
+
+    // Channel
+    var channel: String
+
+    // Creation date
+    var date = Calendar.getInstance().time
+
+    // Link's URL
+    var link: String
+
+    // Author's login
+    var login = ""
+
+    // Author's nickname
+    var nick: String
+
+    // Link's title
+    var title: String
+
+    /**
+     * Creates a new entry.
+     */
+    constructor(
+        link: String,
+        title: String,
+        nick: String,
+        login: String,
+        channel: String,
+        tags: List<String?>
+    ) {
+        this.link = link
+        this.title = title
+        this.nick = nick
+        this.login = login
+        this.channel = channel
+        setTags(tags)
+    }
+
+    /**
+     * Creates a new entry.
+     */
+    constructor(
+        link: String,
+        title: String,
+        nick: String,
+        channel: String,
+        date: Date,
+        tags: List<SyndCategory>
+    ) {
+        this.link = link
+        this.title = title
+        this.nick = nick
+        this.channel = channel
+        this.date = Date(date.time)
+        this.tags.addAll(tags)
+    }
+
+    /**
+     * Adds a new comment.
+     */
+    fun addComment(comment: String?, nick: String?): Int {
+        comments.add(EntryComment(comment!!, nick!!))
+        return comments.size - 1
+    }
+
+    /**
+     * Deletes a specific comment.
+     */
+    fun deleteComment(index: Int) {
+        if (index < comments.size) {
+            comments.removeAt(index)
+        }
+    }
+
+    /**
+     * Returns a comment.
+     */
+    fun getComment(index: Int): EntryComment = comments[index]
+
+    /**
+     * Returns the tags formatted for pinboard.in
+     */
+    val pinboardTags: String
+        get() {
+            val pinboardTags = StringBuilder(nick)
+            for (tag in tags) {
+                pinboardTags.append(',')
+                pinboardTags.append(tag.name)
+            }
+            return pinboardTags.toString()
+        }
+
+    /**
+     * Returns true if the entry has comments.
+     */
+    fun hasComments(): Boolean = comments.isNotEmpty()
+
+    /**
+     * Returns true if the entry has tags.
+     */
+    fun hasTags(): Boolean = tags.isNotEmpty()
+
+    /**
+     * Returns true if a string is contained in the link, title, or nick.
+     */
+    fun matches(match: String?): Boolean {
+        return (StringUtils.containsIgnoreCase(link, match)
+            || StringUtils.containsIgnoreCase(title, match)
+            || StringUtils.containsIgnoreCase(nick, match))
+    }
+
+    /**
+     * Sets a comment.
+     */
+    fun setComment(index: Int, comment: String?, nick: String?) {
+        if (index < comments.size) {
+            comments[index] = EntryComment(comment!!, nick!!)
+        }
+    }
+
+    /**
+     * Sets the tags.
+     */
+    fun setTags(tags: String) {
+        setTags(tags.split(LinksMgr.TAG_MATCH).toTypedArray().toList())
+    }
+
+    /**
+     * Sets the tags.
+     */
+    fun setTags(tags: List<String?>) {
+        if (!tags.isEmpty()) {
+            var category: SyndCategoryImpl
+            for (tag in tags) {
+                if (StringUtils.isNoneBlank(tag)) {
+                    val t = StringUtils.lowerCase(tag)
+                    val mod = t[0]
+                    if (mod == '-') {
+                        // Don't remove the channel tag
+                        if (channel.substring(1) != t.substring(1)) {
+                            category = SyndCategoryImpl()
+                            category.name = t.substring(1)
+                            this.tags.remove(category)
+                        }
+                    } else {
+                        category = SyndCategoryImpl()
+                        if (mod == '+') {
+                            category.name = t.substring(1)
+                        } else {
+                            category.name = t
+                        }
+                        if (!this.tags.contains(category)) {
+                            this.tags.add(category)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    override fun toString(): String {
+        return ("EntryLink{channel='$channel', comments=$comments, date=$date, link='$link', login='$login'," +
+            "nick='$nick', tags=$tags, title='$title'}")
+    }
+
+    companion object {
+        // Serial version UID
+        const val serialVersionUID = 1L
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
index 07de9f9..014846f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -37,6 +37,7 @@ import net.thauvin.erik.mobibot.TwitterTimer
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entriesCount
 import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.getEntry
+import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
 import org.apache.commons.lang3.StringUtils
@@ -76,7 +77,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
     override val isValidProperties: Boolean
         get() {
             for (s in propertyKeys) {
-                if (AUTOPOST_PROP != s && HANDLE_PROP != s && properties[s]!!.isBlank()) {
+                if (AUTOPOST_PROP != s && HANDLE_PROP != s && properties[s].isNullOrBlank()) {
                     return false
                 }
             }
@@ -130,7 +131,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
                 Thread {
                     try {
                         if (logger.isDebugEnabled) {
-                            logger.debug("Posting {}{} to Twitter.", Constants.LINK_CMD, index + 1)
+                            logger.debug("Posting {} to Twitter.", EntriesUtils.buildLinkCmd(index))
                         }
                         post(message = msg, isDm = false)
                     } catch (e: ModuleException) {
@@ -146,7 +147,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
         if (isAutoPost) {
             addEntry(index)
             if (bot.logger.isDebugEnabled) {
-                bot.logger.debug("Scheduling {}{} for posting on Twitter.", Constants.LINK_CMD, index + 1)
+                bot.logger.debug("Scheduling {} for posting on Twitter.", EntriesUtils.buildLinkCmd(index))
             }
             bot.timer.schedule(TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L)
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index d1dcf25..9fc9847 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -138,8 +138,8 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                             }
                             if (cwd.hasWindData()) {
                                 with(cwd.windData) {
-                                    if (this != null && hasSpeed()) {
-                                        messages.add(NoticeMessage("Wind: ${wind(speed)}"))
+                                    if (this != null && hasSpeed() && speed != null) {
+                                        messages.add(NoticeMessage("Wind: ${wind(speed!!)}"))
                                     }
                                 }
                             }
@@ -148,7 +148,9 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                                 val list = cwd.weatherList
                                 if (list != null) {
                                     for (w in list) {
-                                        condition.append(' ').append(w!!.getDescription().capitalize()).append('.')
+                                        if (w != null) {
+                                            condition.append(' ').append(w.getDescription().capitalize()).append('.')
+                                        }
                                     }
                                     messages.add(NoticeMessage(condition.toString()))
                                 }
@@ -182,9 +184,9 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
             return messages
         }
 
-        private fun wind(w: Double?): String {
-            val kmh = w!! * 1.60934
-            return "${Math.round(w)} mph, ${kmh.roundToInt()} km/h"
+        private fun wind(w: Double): String {
+            val kmh = w * 1.60934
+            return "${w.roundToInt()} mph, ${kmh.roundToInt()} km/h"
         }
     }
 
diff --git a/src/test/java/net/thauvin/erik/mobibot/LocalProperties.java b/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
similarity index 57%
rename from src/test/java/net/thauvin/erik/mobibot/LocalProperties.java
rename to src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
index 1585681..04490ed 100644
--- a/src/test/java/net/thauvin/erik/mobibot/LocalProperties.java
+++ b/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
@@ -1,5 +1,5 @@
 /*
- * LocalProperties.java
+ * LocalProperties.kt
  *
  * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -29,54 +29,47 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+package net.thauvin.erik.mobibot
 
-package net.thauvin.erik.mobibot;
-
-import org.apache.commons.lang3.StringUtils;
-import org.testng.annotations.BeforeSuite;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Properties;
+import org.testng.annotations.BeforeSuite
+import java.io.IOException
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.*
 
 /**
- * The <code>properties</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-08
- * @since 1.0
+ * Access to `local.properties`.
  */
-public class LocalProperties {
-    private static final Properties localProps = new Properties();
-
-    public static String getProperty(final String key) {
-        if (localProps.containsKey(key)) {
-            return localProps.getProperty(key);
-        } else {
-            final String env = System.getenv(keyToEnv(key));
-            if (env != null) {
-                localProps.setProperty(key, env);
-            }
-            return env;
-        }
-    }
-
-    private static String keyToEnv(final String key) {
-        return StringUtils.upperCase(key.replace('-', '_'));
-    }
-
+open class LocalProperties {
     @BeforeSuite(alwaysRun = true)
-    public void loadProperties() {
-        final Path localPath = Paths.get("local.properties");
+    fun loadProperties() {
+        val localPath = Paths.get("local.properties")
         if (Files.exists(localPath)) {
-            try (final InputStream stream = Files.newInputStream(localPath)) {
-                localProps.load(stream);
-            } catch (IOException ignore) {
+            try {
+                Files.newInputStream(localPath).use { stream -> localProps.load(stream) }
+            } catch (ignore: IOException) {
                 // Do nothing
             }
         }
     }
+
+    companion object {
+        private val localProps = Properties()
+
+        fun getProperty(key: String): String {
+            return if (localProps.containsKey(key)) {
+                localProps.getProperty(key)
+            } else {
+                val env = System.getenv(keyToEnv(key))
+                if (env != null) {
+                    localProps.setProperty(key, env)
+                }
+                env
+            }
+        }
+
+        private fun keyToEnv(key: String): String {
+            return key.replace('-', '_').toUpperCase()
+        }
+    }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java
deleted file mode 100644
index 68550bc..0000000
--- a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * EntryLinkTest.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.entries;
-
-import com.rometools.rome.feed.synd.SyndCategory;
-import org.testng.annotations.Test;
-
-import java.security.SecureRandom;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * The <code>EntryUtilsTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-04-19
- * @since 1.0
- */
-public class EntryLinkTest {
-    private final EntryLink entryLink = new EntryLink("https://www.mobitopia.org/", "Mobitopia", "Skynx",
-        "JimH", "#mobitopia", List.of("tag1", "tag2", "tag3", "TAG4", "Tag5"));
-
-
-    @Test
-    public void testAddDeleteComment() {
-        int i = 0;
-        for (; i < 5; i++) {
-            entryLink.addComment("c" + i, "u" + i);
-        }
-
-        i = 0;
-        for (final EntryComment comment : entryLink.getComments()) {
-            assertThat(comment.getComment()).as("getComment(" + i + ')').isEqualTo("c" + i);
-            assertThat(comment.getNick()).as("getNick(" + i + ')').isEqualTo("u" + i);
-            i++;
-        }
-
-        final SecureRandom r = new SecureRandom();
-        while (entryLink.getCommentsCount() > 0) {
-            entryLink.deleteComment(r.nextInt(entryLink.getCommentsCount()));
-        }
-        assertThat(entryLink.hasComments()).as("hasComments()").isFalse();
-
-        entryLink.addComment("nothing", "nobody");
-        entryLink.setComment(0, "something", "somebody");
-        assertThat(entryLink.getComment(0).getNick()).as("getNick(somebody)").isEqualTo("somebody");
-        assertThat(entryLink.getComment(0).getComment()).as("getComment(something)").isEqualTo("something");
-
-    }
-
-    @Test
-    public void testTags() {
-        final List<SyndCategory> tags = entryLink.getTags();
-
-        int i = 0;
-        for (final SyndCategory tag : tags) {
-            assertThat(tag.getName()).as("tag.getName(" + i + ')').isEqualTo("tag" + (i + 1));
-            i++;
-        }
-
-        entryLink.setTags("-tag5");
-        entryLink.setTags("+mobitopia");
-        entryLink.setTags("tag4");
-        entryLink.setTags("-mobitopia");
-
-        assertThat(entryLink.getPinboardTags()).as("getPinboardTags()")
-            .isEqualTo(entryLink.getNick() + ",tag1,tag2,tag3,tag4,mobitopia");
-    }
-}
diff --git a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
new file mode 100644
index 0000000..d92b58f
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -0,0 +1,92 @@
+/*
+ * EntryLinkTest.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.entries
+
+import com.rometools.rome.feed.synd.SyndCategory
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
+import java.security.SecureRandom
+
+/**
+ * The `EntryUtilsTest` class.
+ *
+ * @author [Erik C. Thauvin](https://erik.thauvin.net/)
+ * @created 2019-04-19
+ * @since 1.0
+ */
+class EntryLinkTest {
+    private val entryLink = EntryLink(
+        "https://www.mobitopia.org/", "Mobitopia", "Skynx", "JimH", "#mobitopia",
+        listOf("tag1", "tag2", "tag3", "TAG4", "Tag5")
+    )
+
+    @Test
+    fun testAddDeleteComment() {
+        var i = 0
+        while (i < 5) {
+            entryLink.addComment("c$i", "u$i")
+            i++
+        }
+        Assertions.assertThat(entryLink.comments.size).`as`("getComments().size() == 5").isEqualTo(i)
+        i = 0
+        for (comment in entryLink.comments) {
+            Assertions.assertThat(comment.comment).`as`("getComment($i)").isEqualTo("c$i")
+            Assertions.assertThat(comment.nick).`as`("getNick($i)").isEqualTo("u$i")
+            i++
+        }
+        val r = SecureRandom()
+        while (entryLink.comments.size > 0) {
+            entryLink.deleteComment(r.nextInt(entryLink.comments.size))
+        }
+        Assertions.assertThat(entryLink.hasComments()).`as`("hasComments()").isFalse
+        entryLink.addComment("nothing", "nobody")
+        entryLink.setComment(0, "something", "somebody")
+        Assertions.assertThat(entryLink.getComment(0).nick).`as`("getNick(somebody)").isEqualTo("somebody")
+        Assertions.assertThat(entryLink.getComment(0).comment).`as`("getComment(something)").isEqualTo("something")
+    }
+
+    @Test
+    fun testTags() {
+        val tags: List<SyndCategory> = entryLink.tags
+        for ((i, tag) in tags.withIndex()) {
+            Assertions.assertThat(tag.name).`as`("tag.getName($i)").isEqualTo("tag" + (i + 1))
+        }
+        Assertions.assertThat(entryLink.tags.size).`as`("getTags().size() is 5").isEqualTo(5)
+        Assertions.assertThat(entryLink.hasTags()).`as`("hasTags() is true").isTrue
+        entryLink.setTags("-tag5")
+        entryLink.setTags("+mobitopia")
+        entryLink.setTags("tag4")
+        entryLink.setTags("-mobitopia")
+        Assertions.assertThat(entryLink.pinboardTags).`as`("getPinboardTags()")
+            .isEqualTo(entryLink.nick + ",tag1,tag2,tag3,tag4,mobitopia")
+    }
+}

From fb05647b7b7221cee65dfd29a468f0261a365d29 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 2 Dec 2020 22:58:42 -0800
Subject: [PATCH 090/262] Added debug arg on run.

---
 build.gradle | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 55950b9..6b905f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,8 +19,6 @@ final def packageName = 'net.thauvin.erik.mobibot'
 final def deployDir = 'deploy'
 final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 
-mainClassName = packageName + '.Mobibot'
-
 ext.versions = [
     jacoco  : '0.8.6',
     log4j   : '2.14.0',
@@ -79,6 +77,10 @@ java {
     targetCompatibility = JavaVersion.VERSION_11
 }
 
+application {
+    mainClassName = packageName + '.Mobibot'
+}
+
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
     options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
@@ -142,7 +144,7 @@ clean {
 }
 
 run {
-    //args '--v'
+    args '-d'
 }
 
 incrementBuildMeta {

From ca2939629faa453a4534f89a878c1ca53b8d5024 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 2 Dec 2020 22:59:08 -0800
Subject: [PATCH 091/262] Version 0.8.0-beta+287

---
 .../java/net/thauvin/erik/mobibot/ReleaseInfo.java          | 6 +++---
 version.properties                                          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index b548cec..cf5342d 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -13,14 +13,14 @@ import java.time.*;
  */
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
-    public static final String VERSION = "0.8.0-beta+234";
+    public static final String VERSION = "0.8.0-beta+287";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1606946086512L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1606978487815L), ZoneId.systemDefault());
 
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
-    public static final String BUILDMETA = "234";
+    public static final String BUILDMETA = "287";
     public static final String PRERELEASE = "beta";
 
     public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
diff --git a/version.properties b/version.properties
index 418f0b7..f94bcbe 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed Dec 02 13:54:44 PST 2020
-version.buildmeta=234
+#Wed Dec 02 22:54:45 PST 2020
+version.buildmeta=287
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+234
+version.semver=0.8.0-beta+287

From 2d24f5fc97a385d5851caf46f87e33bee4ac1ffe Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 4 Dec 2020 01:40:20 -0800
Subject: [PATCH 092/262] Switched to buffered output stream for stdout/stderr.

---
 .../java/net/thauvin/erik/mobibot/Mobibot.java     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
index 63ec7cf..420833d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
@@ -87,6 +87,7 @@ import org.apache.logging.log4j.core.config.Configurator;
 import org.jibble.pircbot.PircBot;
 import org.jibble.pircbot.User;
 
+import java.io.BufferedOutputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -299,7 +300,6 @@ public class Mobibot extends PircBot {
             System.out.println(ReleaseInfo.WEBSITE);
         } else {
             final Properties p = new Properties();
-
             try (final InputStream fis = Files.newInputStream(
                     Paths.get(commandLine.getOptionValue(Constants.PROPS_ARG.charAt(0), "./mobibot.properties")))) {
                 // Load the properties files
@@ -321,8 +321,8 @@ public class Mobibot extends PircBot {
             // Redirect the stdout and stderr
             if (!commandLine.hasOption(Constants.DEBUG_ARG.charAt(0))) {
                 try {
-                    final PrintStream stdout = new PrintStream(
-                            new FileOutputStream(logsDir + channel.substring(1) + '.' + Utils.today() + ".log", true));
+                    final PrintStream stdout = new PrintStream(new BufferedOutputStream(new FileOutputStream(
+                            logsDir + channel.substring(1) + '.' + Utils.today() + ".log", true)), true);
                     System.setOut(stdout);
                 } catch (IOException e) {
                     System.err.println("Unable to open output (stdout) log file.");
@@ -331,7 +331,9 @@ public class Mobibot extends PircBot {
                 }
 
                 try {
-                    final PrintStream stderr = new PrintStream(new FileOutputStream(logsDir + nickname + ".err", true));
+                    final PrintStream stderr =
+                            new PrintStream(new BufferedOutputStream(
+                                    new FileOutputStream(logsDir + nickname + ".err", true)), true);
                     System.setErr(stderr);
                 } catch (IOException e) {
                     System.err.println("Unable to open error (stderr) log file.");
@@ -724,7 +726,9 @@ public class Mobibot extends PircBot {
     @Override
     protected final void onPrivateMessage(final String sender, final String login, final String hostname,
                                           final String message) {
-        LOGGER.debug(">>> {} : {}", sender, message);
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug(">>> {} : {}", sender, message);
+        }
 
         final String[] cmds = message.split(" ", 2);
         final String cmd = lowerCase(cmds[0]);

From 0e8db3440f782297ae2e6d0be0f40c0959939b26 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 4 Dec 2020 01:44:16 -0800
Subject: [PATCH 093/262] Optimized Links Manager.

---
 config/detekt/baseline.xml                    |  1 +
 .../thauvin/erik/mobibot/commands/AddLog.kt   | 23 ++++++-----
 .../thauvin/erik/mobibot/commands/Info.java   |  2 +-
 .../erik/mobibot/commands/links/Comment.kt    |  4 +-
 .../erik/mobibot/commands/links/LinksMgr.kt   | 41 ++++++++-----------
 .../erik/mobibot/commands/links/Posting.kt    | 17 ++++----
 .../erik/mobibot/commands/links/Tags.kt       |  4 +-
 .../erik/mobibot/commands/links/View.kt       |  9 ++--
 .../thauvin/erik/mobibot/modules/Twitter.kt   |  7 ++--
 9 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 07b0938..32e2375 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -11,6 +11,7 @@
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
+    <ID>MagicNumber:AddLog.kt$AddLog$4</ID>
     <ID>MagicNumber:Comment.kt$Comment$3</ID>
     <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$11</ID>
     <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$3</ID>
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
index f7639a5..2848369 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
@@ -33,8 +33,8 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.addHistory
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.getHistory
+
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.history
 import net.thauvin.erik.mobibot.entries.EntriesMgr
 import java.io.File
 
@@ -52,15 +52,18 @@ class AddLog(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        if (isOp && args.isNotBlank()) {
-            // e.g: 2014-04-01
-            val backlog = File("${bot.logsDir}$args${EntriesMgr.XML_EXT}")
-            if (backlog.exists()) {
-                addHistory(0, args)
-                bot.send(sender, getHistory().toString(), isPrivate)
-            } else {
-                bot.send(sender, "The specified log could not be found.", isPrivate)
+        if (isOp) {
+            if (args.isNotBlank()) {
+                // e.g: 2014-04-01
+                val backlog = File("${bot.logsDir}$args${EntriesMgr.XML_EXT}")
+                if (backlog.exists()) {
+                    history.add(0, args)
+                } else {
+                    bot.send(sender, "The specified log could not be found.", isPrivate)
+                    return
+                }
             }
+            bot.sendList(sender, history, 4, isPrivate, false)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index 1282d78..e9c9975 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -93,7 +93,7 @@ public class Info extends AbstractCommand {
 
         info.append(Utils.uptime(ManagementFactory.getRuntimeMXBean().getUptime()))
             .append(" [Entries: ")
-            .append(LinksMgr.getEntriesCount());
+            .append(LinksMgr.entries.size());
 
         if (isOp) {
             if (getBot().getTell().isEnabled()) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 00b718a..65941cf 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -68,8 +68,8 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
         val cmds = args.substring(1).split("[.:]".toRegex(), 3)
         val index = cmds[0].toInt() - 1
 
-        if (index < LinksMgr.entriesCount) {
-            val entry: EntryLink = LinksMgr.getEntry(index)
+        if (index < LinksMgr.entries.size) {
+            val entry: EntryLink = LinksMgr.entries[index]
             val commentIndex = cmds[1].toInt() - 1
             if (commentIndex < entry.comments.size) {
                 when (val cmd = cmds[2].trim()) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index ac5257d..cd4104b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -40,7 +40,6 @@ import net.thauvin.erik.mobibot.commands.Ignore
 import net.thauvin.erik.mobibot.entries.EntriesMgr
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
-import org.apache.logging.log4j.LogManager
 import org.jsoup.Jsoup
 import java.io.IOException
 
@@ -65,23 +64,22 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         const val TAG_MATCH = ", *| +"
 
         // Entries array
-        private val entries = ArrayList<EntryLink>(0)
+        @JvmField
+        val entries = ArrayList<EntryLink>(0)
 
         // History/backlogs array
-        private val history = ArrayList<String>(0)
+        @JvmField
+        val history = ArrayList<String>(0)
 
-        @JvmStatic
-        val entriesCount
-            get() = entries.size
 
         @JvmStatic
         var startDate: String = Utils.today()
             private set
 
-        @JvmStatic
-        fun addHistory(index: Int, entry: String) {
-            history.add(index, entry)
-        }
+        //        @JvmStatic
+        //        fun addHistory(index: Int, entry: String) {
+        //            history.add(index, entry)
+        //        }
 
         /**
          * Saves the entries.
@@ -93,20 +91,15 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
             EntriesMgr.saveEntries(bot, entries, history, isDayBackup)
         }
 
-        @JvmStatic
-        fun removeEntry(index: Int) {
-            entries.removeAt(index)
-        }
-
-        @JvmStatic
-        fun getEntry(index: Int): EntryLink {
-            return entries[index]
-        }
-
-        @JvmStatic
-        fun getHistory(): List<String> {
-            return history
-        }
+        //        @JvmStatic
+        //        fun removeEntry(index: Int) {
+        //            entries.removeAt(index)
+        //        }
+        //
+        //        @JvmStatic
+        //        fun getEntry(index: Int): EntryLink {
+        //            return entries[index]
+        //        }
 
         @JvmStatic
         fun startup(current: String, backlogs: String, channel: String) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index bf275f5..71ec786 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -36,6 +36,7 @@ import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entries
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
 
@@ -67,7 +68,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
         val cmds = args.substring(1).split(":", limit = 2)
         val index = cmds[0].toInt() - 1
 
-        if (index < LinksMgr.entriesCount) {
+        if (index < entries.size) {
             when (val cmd = cmds[1].trim()) {
                 "" -> showEntry(index)
                 "-" -> removeEntry(sender, login, isOp, index) // L1:-
@@ -88,7 +89,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun addComment(cmd: String, sender: String, index: Int) {
-        val entry: EntryLink = LinksMgr.getEntry(index)
+        val entry: EntryLink = entries[index]
         val commentIndex = entry.addComment(cmd, sender)
         val comment = entry.getComment(commentIndex)
         bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment), false)
@@ -97,7 +98,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
 
     private fun changeTitle(cmd: String, index: Int) {
         if (cmd.length > 1) {
-            val entry: EntryLink = LinksMgr.getEntry(index)
+            val entry: EntryLink = entries[index]
             entry.title = cmd.substring(1).trim()
             bot.updatePin(entry.link, entry)
             bot.send(EntriesUtils.buildLink(index, entry))
@@ -106,7 +107,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun changeUrl(cmd: String, login: String, isOp: Boolean, index: Int) {
-        val entry: EntryLink = LinksMgr.getEntry(index)
+        val entry: EntryLink = entries[index]
         if (entry.login == login || isOp) {
             val link = cmd.substring(1)
             if (link.matches(LinksMgr.LINK_MATCH.toRegex())) {
@@ -122,7 +123,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     private fun changeAuthor(cmd: String, sender: String, isOp: Boolean, index: Int) {
         if (isOp) {
             if (cmd.length > 1) {
-                val entry: EntryLink = LinksMgr.getEntry(index)
+                val entry: EntryLink = entries[index]
                 entry.nick = cmd.substring(1)
                 bot.send(EntriesUtils.buildLink(index, entry))
                 LinksMgr.saveEntries(bot, false)
@@ -133,10 +134,10 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun removeEntry(sender: String, login: String, isOp: Boolean, index: Int) {
-        val entry: EntryLink = LinksMgr.getEntry(index)
+        val entry: EntryLink = LinksMgr.entries[index]
         if (entry.login == login || isOp) {
             bot.deletePin(index, entry)
-            LinksMgr.removeEntry(index)
+            entries.removeAt(index)
             bot.send("Entry ${EntriesUtils.buildLinkCmd(index)} removed.")
             LinksMgr.saveEntries(bot, false)
         } else {
@@ -145,7 +146,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun showEntry(index: Int) {
-        val entry: EntryLink = LinksMgr.getEntry(index)
+        val entry: EntryLink = entries[index]
         bot.send(EntriesUtils.buildLink(index, entry))
         if (entry.hasTags()) {
             bot.send(EntriesUtils.buildTags(index, entry))
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
index 28b57c9..9a9a73e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -63,9 +63,9 @@ class Tags(bot: Mobibot) : AbstractCommand(bot) {
         val cmds = args.substring(1).split("T:", limit = 2)
         val index = cmds[0].toInt() - 1
 
-        if (index < LinksMgr.entriesCount) {
+        if (index < LinksMgr.entries.size) {
             val cmd = cmds[1].trim()
-            val entry: EntryLink = LinksMgr.getEntry(index)
+            val entry: EntryLink = LinksMgr.entries[index]
             if (cmd.isNotEmpty()) {
                 if (entry.login == login || isOp) {
                     entry.setTags(cmd)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index 98dd423..dbafa4a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -35,8 +35,7 @@ package net.thauvin.erik.mobibot.commands.links
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.AbstractCommand
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entriesCount
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.getEntry
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entries
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
 
@@ -62,7 +61,7 @@ class View(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        if (entriesCount != 0) {
+        if (entries.size != 0) {
             showPosts(bot, args, sender)
         } else {
             bot.send(sender, "There is currently nothing to view. Why don't you post something?", isPrivate)
@@ -70,7 +69,7 @@ class View(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun showPosts(bot: Mobibot, args: String, sender: String) {
-        val max = entriesCount
+        val max = entries.size
         var lcArgs = args.toLowerCase()
         var i = 0
         if (lcArgs.isEmpty() && max > maxEntries) {
@@ -96,7 +95,7 @@ class View(bot: Mobibot) : AbstractCommand(bot) {
         var entry: EntryLink
         var sent = 0
         while (i < max && sent < maxEntries) {
-            entry = getEntry(i)
+            entry = entries[i]
             if (lcArgs.isNotBlank()) {
                 if (entry.matches(lcArgs)) {
                     bot.send(sender, EntriesUtils.buildLink(i, entry, true), false)
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
index 014846f..392cf85 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -35,8 +35,7 @@ import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.TwitterTimer
 import net.thauvin.erik.mobibot.Utils
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entriesCount
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.getEntry
+import net.thauvin.erik.mobibot.commands.links.LinksMgr
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
@@ -125,8 +124,8 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
      */
     fun postEntry(index: Int) {
         with(bot) {
-            if (isAutoPost && hasEntry(index) && entriesCount >= index) {
-                val entry = getEntry(index)
+            if (isAutoPost && hasEntry(index) && LinksMgr.entries.size >= index) {
+                val entry = LinksMgr.entries[index]
                 val msg = "${entry.title} ${entry.link} via ${entry.nick} on $channel"
                 Thread {
                     try {

From 8178744f8555362e97759f74ee9f8f51efdf76bc Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 4 Dec 2020 03:05:52 -0800
Subject: [PATCH 094/262] Fixed typo.

---
 .../java/net/thauvin/erik/mobibot/commands/links/Posting.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 71ec786..fcdc20e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -44,7 +44,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "posting"
     override val help = listOf(
         "Post a URL, by saying it on a line on its own:",
-        Utils.helpIndent("<url> [<title>] ${Tags.COMMAND}}: <+tag> [...]]"),
+        Utils.helpIndent("<url> [<title>] ${Tags.COMMAND}: <+tag> [...]]"),
         "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1",
         "To add a title, use its label and a pipe:",
         Utils.helpIndent("${Constants.LINK_CMD}1:|This is the title"),

From 274c711dc27026392163e3892dba06fe994a26e9 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 4 Dec 2020 03:06:19 -0800
Subject: [PATCH 095/262] Version 0.8.0-beta+302

---
 .idea/mobibot.iml                                           | 2 +-
 .idea/modules/mobibot.main.iml                              | 2 +-
 .idea/modules/mobibot.test.iml                              | 2 +-
 .../java/net/thauvin/erik/mobibot/ReleaseInfo.java          | 6 +++---
 version.properties                                          | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 7d99ee9..51a4995 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+147" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+287" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index cc8a457..c6fe00f 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+147" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+287" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index b0c7198..f864b22 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+147" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+287" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index cf5342d..654713c 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -13,14 +13,14 @@ import java.time.*;
  */
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
-    public static final String VERSION = "0.8.0-beta+287";
+    public static final String VERSION = "0.8.0-beta+302";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1606978487815L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1607079230723L), ZoneId.systemDefault());
 
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
-    public static final String BUILDMETA = "287";
+    public static final String BUILDMETA = "302";
     public static final String PRERELEASE = "beta";
 
     public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
diff --git a/version.properties b/version.properties
index f94bcbe..375622b 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed Dec 02 22:54:45 PST 2020
-version.buildmeta=287
+#Fri Dec 04 02:53:48 PST 2020
+version.buildmeta=302
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+287
+version.semver=0.8.0-beta+302

From 92e703b68a763ad50a1a113a0f91b6147255cd98 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 4 Dec 2020 15:49:25 -0800
Subject: [PATCH 096/262] Convert Tell Message Manager to Kotlin.

---
 config/detekt/baseline.xml                    |   6 +
 .../java/net/thauvin/erik/mobibot/Utils.kt    |   8 +-
 .../erik/mobibot/commands/tell/Tell.java      | 393 ------------------
 .../erik/mobibot/commands/tell/Tell.kt        | 362 ++++++++++++++++
 .../mobibot/commands/tell/TellMessage.java    | 195 ---------
 .../erik/mobibot/commands/tell/TellMessage.kt | 112 +++++
 .../commands/tell/TellMessagesMgr.java        | 132 ------
 .../mobibot/commands/tell/TellMessagesMgr.kt  | 104 +++++
 .../commands/tell/TellMessageTest.java        |  81 ----
 .../mobibot/commands/tell/TellMessageTest.kt  |  68 +++
 10 files changed, 658 insertions(+), 803 deletions(-)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
 delete mode 100644 src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java
 create mode 100644 src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 32e2375..59b5db4 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -24,6 +24,8 @@
     <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
     <ID>MagicNumber:Modules.kt$Modules$7</ID>
     <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
+    <ID>MagicNumber:Tell.kt$Tell$50</ID>
+    <ID>MagicNumber:Tell.kt$Tell$7</ID>
     <ID>MagicNumber:Twitter.kt$Twitter$1000L</ID>
     <ID>MagicNumber:Twitter.kt$Twitter$60L</ID>
     <ID>MagicNumber:Users.kt$Users$8</ID>
@@ -55,6 +57,9 @@
     <ID>NestedBlockDepth:Lookup.kt$Lookup$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>NestedBlockDepth:StockQuote.kt$StockQuote$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>NestedBlockDepth:Tell.kt$Tell$ @JvmOverloads fun send(nickname: String, isMessage: Boolean = false)</ID>
+    <ID>NestedBlockDepth:Tell.kt$Tell$// Delete message. private fun deleteMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean)</ID>
+    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr.Companion$ fun save(file: String, messages: List&lt;TellMessage?&gt;?, logger: Logger)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
@@ -66,6 +71,7 @@
     <ID>TooGenericExceptionCaught:FeedReader.kt$FeedReader$e: Exception</ID>
     <ID>TooGenericExceptionCaught:StockQuote.kt$StockQuote.Companion$e: NullPointerException</ID>
     <ID>TooGenericExceptionCaught:Weather2.kt$Weather2.Companion$e: NullPointerException</ID>
+    <ID>TooManyFunctions:Tell.kt$Tell : AbstractCommand</ID>
     <ID>TooManyFunctions:Utils.kt$Utils$Companion</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index e14f1eb..09f7062 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -298,8 +298,12 @@ class Utils private constructor() {
          * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
          */
         @JvmStatic
-        fun utcDateTime(date: LocalDateTime): String {
-            return date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+        fun utcDateTime(date: LocalDateTime?): String {
+            return if (date != null) {
+                date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+            } else {
+                ""
+            }
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
deleted file mode 100644
index d3fa026..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Tell.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands.tell;
-
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.commands.AbstractCommand;
-import net.thauvin.erik.mobibot.commands.links.View;
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * The <code>Tell</code> command.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2016-07-02
- * @since 1.0
- */
-public class Tell extends AbstractCommand {
-    /**
-     * Max days property.
-     */
-    public static final String MAX_DAYS_PROP = "tell-max-days";
-    /**
-     * Max size proeprty.
-     */
-    public static final String MAX_SIZE_PROP = "tell-max-size";
-    /**
-     * The tell command.
-     */
-    public static final String TELL_CMD = "tell";
-    // Arrow
-    private static final String ARROW = " --> ";
-    // Serialized object file extension
-    private static final String SER_EXT = ".ser";
-    // All keyword
-    private static final String TELL_ALL_KEYWORD = "all";
-    //T he delete command.
-    private static final String TELL_DEL_KEYWORD = "del";
-    // Messages queue
-    private final List<TellMessage> messages = new CopyOnWriteArrayList<>();
-    // Serialized object file
-    private final String serializedObject;
-    // Maximum number of days to keep messages
-    private int maxDays = 7;
-    // Message maximum queue size
-    private int maxSize = 50;
-
-    /**
-     * Creates a new instance.
-     *
-     * @param bot The bot.
-     */
-    public Tell(final Mobibot bot) {
-        super(bot);
-        initProperties(MAX_DAYS_PROP, MAX_SIZE_PROP);
-
-        // Load the message queue
-        serializedObject = bot.getLogsDir() + bot.getName() + SER_EXT;
-        messages.addAll(TellMessagesMgr.load(serializedObject, bot.getLogger()));
-
-        if (clean()) {
-            save();
-        }
-    }
-
-    /**
-     * Cleans the messages queue.
-     *
-     * @return <code>true</code> if the queue was cleaned.
-     */
-    @SuppressWarnings("WeakerAccess")
-    final boolean clean() {
-        if (getBot().getLogger().isDebugEnabled()) {
-            getBot().getLogger().debug("Cleaning the messages.");
-        }
-        return TellMessagesMgr.clean(messages, maxDays);
-    }
-
-    // Delete message.
-    private void deleteMessage(final String sender, final String args, final boolean isOp, final boolean isPrivate) {
-        final String[] split = args.split(" ");
-
-        if (split.length == 2) {
-            final String id = split[1];
-            boolean deleted = false;
-
-            if (TELL_ALL_KEYWORD.equalsIgnoreCase(id)) {
-                for (final TellMessage message : messages) {
-                    if (message.getSender().equalsIgnoreCase(sender) && message.isReceived()) {
-                        messages.remove(message);
-                        deleted = true;
-                    }
-                }
-
-                if (deleted) {
-                    save();
-                    getBot().send(sender, "Delivered messages have been deleted.", isPrivate);
-                } else {
-                    getBot().send(sender, "No delivered messages were found.", isPrivate);
-                }
-
-            } else {
-                boolean found = false;
-
-                for (final TellMessage message : messages) {
-                    found = message.isMatchId(id);
-
-                    if (found && (message.getSender().equalsIgnoreCase(sender) || getBot().isOp(sender))) {
-                        messages.remove(message);
-
-                        save();
-                        getBot().send(sender, "Your message was deleted from the queue.", isPrivate);
-                        deleted = true;
-                        break;
-                    }
-                }
-
-                if (!deleted) {
-                    if (found) {
-                        getBot().send(sender, "Only messages that you sent can be deleted.", isPrivate);
-                    } else {
-                        getBot().send(sender, "The specified message [ID " + id + "] could not be found.", isPrivate);
-                    }
-                }
-            }
-        } else {
-            helpResponse(args, sender, isOp, isPrivate);
-        }
-    }
-
-    @NotNull
-    @Override
-    public String getName() {
-        return TELL_CMD;
-    }
-
-    @NotNull
-    @Override
-    public List<String> getHelp() {
-        return List.of("To send a message to someone when they join the channel:",
-                       Utils.helpIndent("%c " + TELL_CMD + " <nick> <message>"),
-                       "To view queued and sent messages:",
-                       Utils.helpIndent("%c " + TELL_CMD + ' ' + View.VIEW_CMD),
-                       "Messages are kept for " + Utils.bold(maxDays)
-                       + Utils.plural(maxDays, " day.", " days."));
-    }
-
-    @Override
-    public boolean isOp() {
-        return false;
-    }
-
-    @Override
-    public boolean isPublic() {
-        return isEnabled();
-    }
-
-    @Override
-    public boolean isVisible() {
-        return isEnabled();
-    }
-
-    @Override
-    public void commandResponse(@NotNull final String sender,
-                                @NotNull final String login,
-                                @NotNull final String args,
-                                final boolean isOp,
-                                final boolean isPrivate) {
-        if (isEnabled()) {
-            if (StringUtils.isBlank(args)) {
-                helpResponse(args, sender, isOp, isPrivate);
-            } else if (args.startsWith(View.VIEW_CMD)) {
-                if (getBot().isOp(sender) && (View.VIEW_CMD + ' ' + TELL_ALL_KEYWORD).equals(args)) {
-                    viewAll(sender, isPrivate);
-                } else {
-                    viewMessages(sender, isPrivate);
-                }
-            } else if (args.startsWith(TELL_DEL_KEYWORD + ' ')) {
-                deleteMessage(sender, args, isOp, isPrivate);
-            } else {
-                newMessage(sender, args, isOp, isPrivate);
-            }
-
-            if (clean()) {
-                save();
-            }
-        }
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return maxSize > 0 && maxDays > 0;
-    }
-
-    @Override
-    public void setProperty(@NotNull final String key, @NotNull final String value) {
-        super.setProperty(key, value);
-        if (MAX_DAYS_PROP.equals(key)) {
-            this.maxDays = Utils.getIntProperty(value, maxDays);
-        } else if (MAX_SIZE_PROP.equals(key)) {
-            this.maxSize = Utils.getIntProperty(value, maxSize);
-        }
-    }
-
-    // New message.
-    private void newMessage(final String sender, final String args, final boolean isOp, final boolean isPrivate) {
-        final String[] split = args.split(" ", 2);
-
-        if (split.length == 2 && (StringUtils.isNotBlank(split[1]) && split[1].contains(" "))) {
-            if (messages.size() < maxSize) {
-                final TellMessage message = new TellMessage(sender, split[0], split[1].trim());
-
-                messages.add(message);
-
-                save();
-
-                getBot().send(sender, "Message [ID " + message.getId() + "] was queued for "
-                                      + Utils.bold(message.getRecipient()), isPrivate);
-            } else {
-                getBot().send(sender, "Sorry, the messages queue is currently full.", isPrivate);
-            }
-        } else {
-            helpResponse(args, sender, isOp, isPrivate);
-        }
-    }
-
-    /**
-     * Saves the messages queue.
-     */
-    @SuppressWarnings("WeakerAccess")
-    final void save() {
-        TellMessagesMgr.save(serializedObject, messages, getBot().getLogger());
-    }
-
-    /**
-     * Checks and sends messages.
-     *
-     * @param nickname  The user's nickname.
-     * @param isMessage The message flag.
-     */
-    public void send(final String nickname, final boolean isMessage) {
-        if (isEnabled() && !nickname.equals(getBot().getNick())) {
-            messages.stream().filter(message -> message.isMatch(nickname)).forEach(message -> {
-                if (message.getRecipient().equalsIgnoreCase(nickname) && !message.isReceived()) {
-                    if (message.getSender().equals(nickname)) {
-                        if (!isMessage) {
-                            getBot().send(nickname, Utils.bold("You") + " wanted me to remind you: "
-                                                    + Utils.reverseColor(message.getMessage()),
-                                          true);
-
-                            message.setIsReceived();
-                            message.setIsNotified();
-
-                            save();
-                        }
-                    } else {
-                        getBot().send(nickname, message.getSender() + " wanted me to tell you: "
-                                                + Utils.reverseColor(message.getMessage()),
-                                      true);
-
-                        message.setIsReceived();
-
-                        save();
-                    }
-                } else if (message.getSender().equalsIgnoreCase(nickname) && message.isReceived()
-                           && !message.isNotified()) {
-                    getBot().send(nickname,
-                                  "Your message "
-                                  + Utils.reverseColor("[ID " + message.getId() + ']') + " was sent to "
-                                  + Utils.bold(message.getRecipient()) + " on "
-                                  + Utils.utcDateTime(message.getReceived()),
-                                  true);
-
-                    message.setIsNotified();
-
-                    save();
-                }
-            });
-        }
-    }
-
-    /**
-     * Checks and sends messages.
-     *
-     * @param nickname The user's nickname.
-     */
-    public void send(final String nickname) {
-        send(nickname, false);
-    }
-
-    /**
-     * Returns the messages queue size.
-     *
-     * @return The size.
-     */
-    public int size() {
-        return messages.size();
-    }
-
-    // View all messages.
-    private void viewAll(final String sender, final boolean isPrivate) {
-        if (!messages.isEmpty()) {
-            for (final TellMessage message : messages) {
-                getBot().send(sender, Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
-                                      + " [ID: " + message.getId() + ", "
-                                      + (message.isReceived() ? "DELIVERED" : "QUEUED") + ']',
-                              isPrivate);
-            }
-        } else {
-            getBot().send(sender, "There are no messages in the queue.", isPrivate);
-        }
-    }
-
-    // View messages.
-    private void viewMessages(final String sender, final boolean isPrivate) {
-        boolean hasMessage = false;
-
-        for (final TellMessage message : messages) {
-            if (message.isMatch(sender)) {
-                if (!hasMessage) {
-                    hasMessage = true;
-                    getBot().send(sender, "Here are your messages: ", isPrivate);
-                }
-
-                if (message.isReceived()) {
-                    getBot().send(sender,
-                                  Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
-                                  + " [" + Utils.utcDateTime(message.getReceived()) + ", ID: "
-                                  + Utils.bold(message.getId()) + ", DELIVERED]",
-                                  isPrivate);
-
-                } else {
-                    getBot().send(sender,
-                                  Utils.bold(message.getSender()) + ARROW + Utils.bold(message.getRecipient())
-                                  + " [" + Utils.utcDateTime(message.getQueued()) + ", ID: "
-                                  + Utils.bold(message.getId()) + ", QUEUED]",
-                                  isPrivate);
-                }
-
-                getBot().send(sender, Utils.helpIndent(message.getMessage()), isPrivate);
-            }
-        }
-
-        if (!hasMessage) {
-            getBot().send(sender, "You have no messages in the queue.", isPrivate);
-        } else {
-            getBot().send(sender, "To delete one or all delivered messages:", isPrivate);
-            getBot().send(sender,
-                          Utils.helpIndent(Utils.helpFormat(
-                                  "%c " + TELL_CMD + ' ' + TELL_DEL_KEYWORD + " <id|" + TELL_ALL_KEYWORD + '>',
-                                  getBot().getNick(),
-                                  isPrivate)),
-                          isPrivate);
-            getBot().send(sender,
-                          "Messages are kept for " + Utils.bold(maxDays)
-                          + Utils.plural(maxDays, " day.", " days."), isPrivate);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
new file mode 100644
index 0000000..0b485eb
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -0,0 +1,362 @@
+/*
+ * Tell.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.commands.tell
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.Companion.bold
+import net.thauvin.erik.mobibot.Utils.Companion.getIntProperty
+import net.thauvin.erik.mobibot.Utils.Companion.helpFormat
+import net.thauvin.erik.mobibot.Utils.Companion.helpIndent
+import net.thauvin.erik.mobibot.Utils.Companion.plural
+import net.thauvin.erik.mobibot.Utils.Companion.reverseColor
+import net.thauvin.erik.mobibot.Utils.Companion.utcDateTime
+import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.commands.links.View
+import org.apache.commons.lang3.StringUtils
+import java.util.concurrent.CopyOnWriteArrayList
+
+/**
+ * The `Tell` command.
+ */
+class Tell(bot: Mobibot) : AbstractCommand(bot) {
+    // Messages queue
+    private val messages: MutableList<TellMessage> = CopyOnWriteArrayList()
+
+    // Serialized object file
+    private val serializedObject: String
+
+    // Maximum number of days to keep messages
+    private var maxDays = 7
+
+    // Message maximum queue size
+    private var maxSize = 50
+
+    /**
+     * Cleans the messages queue.
+     */
+    private fun clean(): Boolean {
+        if (bot.logger.isDebugEnabled) {
+            bot.logger.debug("Cleaning the messages.")
+        }
+        return TellMessagesMgr.clean(messages, maxDays)
+    }
+
+    // Delete message.
+    private fun deleteMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean) {
+        val split = args.split(" ").toTypedArray()
+        if (split.size == 2) {
+            val id = split[1]
+            var deleted = false
+            if (TELL_ALL_KEYWORD.equals(id, ignoreCase = true)) {
+                for (message in messages) {
+                    if (message.sender.equals(sender, ignoreCase = true) && message.isReceived) {
+                        messages.remove(message)
+                        deleted = true
+                    }
+                }
+                if (deleted) {
+                    save()
+                    bot.send(sender, "Delivered messages have been deleted.", isPrivate)
+                } else {
+                    bot.send(sender, "No delivered messages were found.", isPrivate)
+                }
+            } else {
+                var found = false
+                for (message in messages) {
+                    found = message.isMatchId(id)
+                    if (found && (message.sender.equals(sender, ignoreCase = true) || bot.isOp(sender))) {
+                        messages.remove(message)
+                        save()
+                        bot.send(sender, "Your message was deleted from the queue.", isPrivate)
+                        deleted = true
+                        break
+                    }
+                }
+                if (!deleted) {
+                    if (found) {
+                        bot.send(sender, "Only messages that you sent can be deleted.", isPrivate)
+                    } else {
+                        bot.send(sender, "The specified message [ID $id] could not be found.", isPrivate)
+                    }
+                }
+            }
+        } else {
+            helpResponse(args, sender, isOp, isPrivate)
+        }
+    }
+
+    /**
+     * The tell command.
+     */
+    override val name = "tell"
+
+    override val help: List<String>
+        get() = listOf(
+            "To send a message to someone when they join the channel:",
+            helpIndent("%c $name <nick> <message>"),
+            "To view queued and sent messages:",
+            helpIndent("%c $name ${View.VIEW_CMD}"),
+            "Messages are kept for " + bold(maxDays)
+                + plural(maxDays.toLong(), " day.", " days.")
+        )
+    override val isOp: Boolean
+        get() = false
+    override val isPublic: Boolean
+        get() = isEnabled()
+    override val isVisible: Boolean
+        get() = isEnabled()
+
+    override fun commandResponse(
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isEnabled()) {
+            if (StringUtils.isBlank(args)) {
+                helpResponse(args, sender, isOp, isPrivate)
+            } else if (args.startsWith(View.VIEW_CMD)) {
+                if (bot.isOp(sender) && "${View.VIEW_CMD} $TELL_ALL_KEYWORD" == args) {
+                    viewAll(sender, isPrivate)
+                } else {
+                    viewMessages(sender, isPrivate)
+                }
+            } else if (args.startsWith("$TELL_DEL_KEYWORD ")) {
+                deleteMessage(sender, args, isOp, isPrivate)
+            } else {
+                newMessage(sender, args, isOp, isPrivate)
+            }
+            if (clean()) {
+                save()
+            }
+        }
+    }
+
+    override fun isEnabled(): Boolean {
+        return maxSize > 0 && maxDays > 0
+    }
+
+    override fun setProperty(key: String, value: String) {
+        super.setProperty(key, value)
+        if (MAX_DAYS_PROP == key) {
+            maxDays = getIntProperty(value, maxDays)
+        } else if (MAX_SIZE_PROP == key) {
+            maxSize = getIntProperty(value, maxSize)
+        }
+    }
+
+    // New message.
+    private fun newMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean) {
+        val split = args.split(" ".toRegex(), 2).toTypedArray()
+        if (split.size == 2 && StringUtils.isNotBlank(split[1]) && split[1].contains(" ")) {
+            if (messages.size < maxSize) {
+                val message = TellMessage(sender, split[0], split[1].trim())
+                messages.add(message)
+                save()
+                bot.send(sender, "Message [ID ${message.id}] was queued for ${bold(message.recipient)}", isPrivate
+                )
+            } else {
+                bot.send(sender, "Sorry, the messages queue is currently full.", isPrivate)
+            }
+        } else {
+            helpResponse(args, sender, isOp, isPrivate)
+        }
+    }
+
+    /**
+     * Saves the messages queue.
+     */
+    private fun save() {
+        TellMessagesMgr.save(serializedObject, messages, bot.logger)
+    }
+
+    /**
+     * Checks and sends messages.
+     */
+    @JvmOverloads
+    fun send(nickname: String, isMessage: Boolean = false) {
+        if (isEnabled() && nickname != bot.nick) {
+            messages.stream().filter { message: TellMessage -> message.isMatch(nickname) }
+                .forEach { message: TellMessage ->
+                    if (message.recipient.equals(nickname, ignoreCase = true) && !message.isReceived) {
+                        if (message.sender == nickname) {
+                            if (!isMessage) {
+                                bot.send(
+                                    nickname,
+                                    "${bold("You")} wanted me to remind you: ${reverseColor(message.message)}",
+                                    true
+                                )
+                                message.isReceived = true
+                                message.isNotified = true
+                                save()
+                            }
+                        } else {
+                            bot.send(
+                                nickname,
+                                "${message.sender} wanted me to tell you: ${reverseColor(message.message)}",
+                                true
+                            )
+                            message.isReceived = true
+                            save()
+                        }
+                    } else if (message.sender.equals(nickname, ignoreCase = true) && message.isReceived
+                        && !message.isNotified
+                    ) {
+                        bot.send(
+                            nickname,
+                            "Your message ${reverseColor("[ID " + message.id + ']')} was sent to " +
+                                "${bold(message.recipient)} on ${utcDateTime(message.receptionDate)}",
+                            true
+                        )
+                        message.isNotified = true
+                        save()
+                    }
+                }
+        }
+    }
+
+    /**
+     * Returns the messages queue size.
+     *
+     * @return The size.
+     */
+    fun size(): Int {
+        return messages.size
+    }
+
+    // View all messages.
+    private fun viewAll(sender: String, isPrivate: Boolean) {
+        if (messages.isNotEmpty()) {
+            for (message in messages) {
+                bot.send(
+                    sender, bold(message.sender) + ARROW + bold(message.recipient)
+                        + " [ID: " + message.id + ", "
+                        + (if (message.isReceived) "DELIVERED" else "QUEUED") + ']',
+                    isPrivate
+                )
+            }
+        } else {
+            bot.send(sender, "There are no messages in the queue.", isPrivate)
+        }
+    }
+
+    // View messages.
+    private fun viewMessages(sender: String, isPrivate: Boolean) {
+        var hasMessage = false
+        for (message in messages) {
+            if (message.isMatch(sender)) {
+                if (!hasMessage) {
+                    hasMessage = true
+                    bot.send(sender, "Here are your messages: ", isPrivate)
+                }
+                if (message.isReceived) {
+                    bot.send(
+                        sender,
+                        bold(message.sender) + ARROW + bold(message.recipient)
+                            + " [" + utcDateTime(message.receptionDate) + ", ID: "
+                            + bold(message.id) + ", DELIVERED]",
+                        isPrivate
+                    )
+                } else {
+                    bot.send(
+                        sender,
+                        bold(message.sender) + ARROW + bold(message.recipient)
+                            + " [" + utcDateTime(message.queued) + ", ID: "
+                            + bold(message.id) + ", QUEUED]",
+                        isPrivate
+                    )
+                }
+                bot.send(sender, helpIndent(message.message), isPrivate)
+            }
+        }
+        if (!hasMessage) {
+            bot.send(sender, "You have no messages in the queue.", isPrivate)
+        } else {
+            bot.send(sender, "To delete one or all delivered messages:", isPrivate)
+            bot.send(
+                sender,
+                helpIndent(
+                    helpFormat(
+                        "%c $name $TELL_DEL_KEYWORD <id|$TELL_ALL_KEYWORD>",
+                        bot.nick,
+                        isPrivate
+                    )
+                ),
+                isPrivate
+            )
+            bot.send(
+                sender,
+                "Messages are kept for ${bold(maxDays)}${plural(maxDays.toLong(), " day.", " days.")}",
+                isPrivate
+            )
+        }
+    }
+
+    companion object {
+        /**
+         * Max days property.
+         */
+        const val MAX_DAYS_PROP = "tell-max-days"
+
+        /**
+         * Max size proeprty.
+         */
+        const val MAX_SIZE_PROP = "tell-max-size"
+
+        // Arrow
+        private const val ARROW = " --> "
+
+        // Serialized object file extension
+        private const val SER_EXT = ".ser"
+
+        // All keyword
+        private const val TELL_ALL_KEYWORD = "all"
+
+        //T he delete command.
+        private const val TELL_DEL_KEYWORD = "del"
+    }
+
+    /**
+     * Creates a new instance.
+     */
+    init {
+        initProperties(MAX_DAYS_PROP, MAX_SIZE_PROP)
+
+        // Load the message queue
+        serializedObject = bot.logsDir + bot.name + SER_EXT
+        messages.addAll(TellMessagesMgr.load(serializedObject, bot.logger))
+        if (clean()) {
+            save()
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
deleted file mode 100644
index 40d71f7..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * TellMessage.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands.tell;
-
-import java.io.Serializable;
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
-/**
- * The <code>TellMessage</code> class.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-24
- * @since 1.0
- */
-@SuppressWarnings("PMD.DataClass")
-public class TellMessage implements Serializable {
-    private static final long serialVersionUID = 2L;
-    private final String id;
-    private final String message;
-    private final LocalDateTime queued;
-    private final String recipient;
-    private final String sender;
-    private boolean isNotified;
-    private boolean isReceived;
-    private LocalDateTime received;
-
-    /**
-     * Create a new message.
-     *
-     * @param sender    The sender's nick.
-     * @param recipient The recipient's nick.
-     * @param message   The message.
-     */
-    TellMessage(final String sender, final String recipient, final String message) {
-        this.sender = sender;
-        this.recipient = recipient;
-        this.message = message;
-
-        this.queued = LocalDateTime.now(Clock.systemUTC());
-        this.id = this.queued.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
-    }
-
-    /**
-     * Returns the message id.
-     *
-     * @return The message id.
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Returns the message text.
-     *
-     * @return The text of the message.
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * Returns the queued date/time.
-     *
-     * @return <code>true</code> if the message is queued.
-     */
-    LocalDateTime getQueued() {
-        return queued;
-    }
-
-    /**
-     * Returns the state of the received flag.
-     *
-     * @return <code>true</code> if the message has been received.
-     */
-    public LocalDateTime getReceived() {
-        return received;
-    }
-
-    /**
-     * Returns the message's recipient.
-     *
-     * @return The recipient of the message.
-     */
-    String getRecipient() {
-        return recipient;
-    }
-
-    /**
-     * Returns the message's sender.
-     *
-     * @return The sender of the message.
-     */
-    public String getSender() {
-        return sender;
-    }
-
-    /**
-     * Matches the message sender or recipient.
-     *
-     * @param nick The nickname to match with.
-     * @return <code>true</code> if the nickname matches.
-     */
-    boolean isMatch(final String nick) {
-        return (sender.equalsIgnoreCase(nick) || recipient.equalsIgnoreCase(nick));
-    }
-
-    /**
-     * Match the message ID.
-     *
-     * @param id The ID to match with.
-     * @return <code>true</code> if the id matches.
-     */
-    boolean isMatchId(final String id) {
-        return this.id.equals(id);
-    }
-
-    /**
-     * Returns the notification flag state.
-     *
-     * @return <code>true</code> if the sender has been notified.
-     */
-    boolean isNotified() {
-        return isNotified;
-    }
-
-    /**
-     * Returns the received flag state.
-     *
-     * @return <code>true</code> if the message was received.
-     */
-    public boolean isReceived() {
-        return isReceived;
-    }
-
-    /**
-     * Sets the notified flag.
-     */
-    void setIsNotified() {
-        isNotified = true;
-    }
-
-    /**
-     * Sets the received flag.
-     */
-    void setIsReceived() {
-        received = LocalDateTime.now(Clock.systemUTC());
-        isReceived = true;
-    }
-
-    @Override
-    public String toString() {
-        return "TellMessage{"
-               + "id='" + id + '\''
-               + ", isNotified=" + isNotified
-               + ", isReceived=" + isReceived
-               + ", message='" + message + '\''
-               + ", queued=" + queued
-               + ", received=" + received
-               + ", recipient='" + recipient + '\''
-               + ", sender='" + sender + '\''
-               + '}';
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
new file mode 100644
index 0000000..4dd3f40
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
@@ -0,0 +1,112 @@
+/*
+ * TellMessage.kt
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.commands.tell
+
+import java.io.Serializable
+import java.time.Clock
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+/**
+ * The `TellMessage` class.
+ */
+class TellMessage internal constructor(
+    /**
+     * Returns the message's sender.
+     */
+    val sender: String,
+
+    /**
+     * Returns the message's recipient.
+     */
+    val recipient: String,
+
+    /**
+     * Returns the message text.
+     */
+    val message: String
+) : Serializable {
+    /**
+     * Returns the queued date/time.
+     */
+    var queued: LocalDateTime = LocalDateTime.now(Clock.systemUTC())
+
+    /**
+     * Returns the message id.
+     */
+    var id: String = queued.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))
+
+    /**
+     * Returns {@code true) if a notification was send.
+     */
+    var isNotified = false
+
+    /**
+     * Returns {@code true) if the message was received.
+     */
+    var isReceived = false
+       set(value) {
+           if (value) {
+               receptionDate = LocalDateTime.now(Clock.systemUTC())
+           }
+           field = value
+       }
+
+    /**
+     * Return the message creating date.
+     */
+    var receptionDate: LocalDateTime = LocalDateTime.MIN
+
+
+    /**
+     * Matches the message sender or recipient.
+     */
+    fun isMatch(nick: String?): Boolean {
+        return sender.equals(nick, ignoreCase = true) || recipient.equals(nick, ignoreCase = true)
+    }
+
+    /**
+     * Match the message ID.
+     */
+    fun isMatchId(id: String): Boolean {
+        return this.id == id
+    }
+
+    override fun toString(): String {
+        return ("TellMessage{id='$id', isNotified=$isNotified, isReceived=$isReceived, message='$message', " +
+            "queued=$queued, received=$receptionDate, recipient='$recipient', sender='$sender'}")
+    }
+
+    companion object {
+        private const val serialVersionUID = 2L
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
deleted file mode 100644
index 98eed8a..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * TellMessagesMgr.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands.tell;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.apache.logging.log4j.Logger;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.time.Clock;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * The Tell Messages Manager.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-26
- * @since 1.0
- */
-final class TellMessagesMgr {
-    /**
-     * Disables the default constructor.
-     *
-     * @throws UnsupportedOperationException If the constructor is called.
-     */
-    private TellMessagesMgr() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
-
-    /**
-     * Cleans the messages queue.
-     *
-     * @param tellMessages The messages list.
-     * @param tellMaxDays  The maximum number of days to keep messages for.
-     * @return <code>True</code> if the queue was cleaned.
-     */
-    static boolean clean(final List<TellMessage> tellMessages, final int tellMaxDays) {
-        final LocalDateTime today = LocalDateTime.now(Clock.systemUTC());
-
-        return tellMessages.removeIf(o -> o.getQueued().plusDays(tellMaxDays).isBefore(today));
-    }
-
-    /**
-     * Loads the messages.
-     *
-     * @param file   The serialized objects file.
-     * @param logger The logger.
-     * @return The {@link TellMessage} array.
-     */
-    @SuppressWarnings("unchecked")
-    @SuppressFBWarnings("OBJECT_DESERIALIZATION")
-    public static List<TellMessage> load(final String file, final Logger logger) {
-        try {
-            try (final ObjectInput input = new ObjectInputStream(
-                    new BufferedInputStream(Files.newInputStream(Paths.get(file))))) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Loading the messages.");
-                }
-                return ((List<TellMessage>) input.readObject());
-            }
-        } catch (FileNotFoundException ignore) {
-            // Do nothing
-        } catch (IOException | ClassNotFoundException e) {
-            logger.error("An error occurred loading the messages queue.", e);
-        }
-
-        return new ArrayList<>();
-    }
-
-    /**
-     * Saves the messages.
-     *
-     * @param file     The serialized objects file.
-     * @param messages The {@link TellMessage} array.
-     * @param logger   The logger.
-     */
-    public static void save(final String file, final List<TellMessage> messages, final Logger logger) {
-        try {
-            try (final BufferedOutputStream bos = new BufferedOutputStream(Files.newOutputStream(Paths.get(file)))) {
-                try (final ObjectOutput output = new ObjectOutputStream(bos)) {
-                    if (logger.isDebugEnabled()) {
-                        logger.debug("Saving the messages.");
-                    }
-                    output.writeObject(messages);
-                }
-            }
-        } catch (IOException e) {
-            logger.error("Unable to save messages queue.", e);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
new file mode 100644
index 0000000..44f487d
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -0,0 +1,104 @@
+/*
+ * TellMessagesMgr.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.commands.tell
+
+import org.apache.logging.log4j.Logger
+import java.time.LocalDateTime
+import java.io.ObjectInputStream
+import java.io.BufferedInputStream
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.lang.ClassNotFoundException
+import java.io.BufferedOutputStream
+import java.io.ObjectOutputStream
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.time.Clock
+import java.util.ArrayList
+
+/**
+ * The Tell Messages Manager.
+ */
+internal class TellMessagesMgr private constructor() {
+    companion object {
+        /**
+         * Cleans the messages queue.
+         */
+        fun clean(tellMessages: MutableList<TellMessage>, tellMaxDays: Int): Boolean {
+            val today = LocalDateTime.now(Clock.systemUTC())
+            return tellMessages.removeIf { o: TellMessage -> o.queued.plusDays(tellMaxDays.toLong()).isBefore(today) }
+        }
+
+        /**
+         * Loads the messages.
+         */
+
+        fun load(file: String, logger: Logger): List<TellMessage> {
+            try {
+                ObjectInputStream(
+                    BufferedInputStream(Files.newInputStream(Paths.get(file)))
+                ).use { input ->
+                    if (logger.isDebugEnabled) {
+                        logger.debug("Loading the messages.")
+                    }
+                    @Suppress("UNCHECKED_CAST")
+                    return input.readObject() as List<TellMessage>
+                }
+            } catch (ignore: FileNotFoundException) {
+                // Do nothing
+            } catch (e: IOException) {
+                logger.error("An IO error occurred loading the messages queue.", e)
+            } catch (e: ClassNotFoundException) {
+                logger.error("An error occurred loading the messages queue.", e)
+            }
+            return ArrayList()
+        }
+
+        /**
+         * Saves the messages.
+         */
+        fun save(file: String, messages: List<TellMessage?>?, logger: Logger) {
+            try {
+                BufferedOutputStream(Files.newOutputStream(Paths.get(file))).use { bos ->
+                    ObjectOutputStream(bos).use { output ->
+                        if (logger.isDebugEnabled) {
+                            logger.debug("Saving the messages.")
+                        }
+                        output.writeObject(messages)
+                    }
+                }
+            } catch (e: IOException) {
+                logger.error("Unable to save messages queue.", e)
+            }
+        }
+    }
+}
diff --git a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java
deleted file mode 100644
index e57c52a..0000000
--- a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * TellMessageTest.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands.tell;
-
-import org.testng.annotations.Test;
-
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.temporal.Temporal;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * The <code>TellMessageTest</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2019-07-29
- * @since 1.0
- */
-public class TellMessageTest {
-    private boolean isValidDate(final Temporal date) {
-        return Duration.between(date, LocalDateTime.now()).toMinutes() < 1;
-    }
-
-    @Test
-    void testTellMessage() {
-        final String message = "Test message.";
-        final String recipient = "recipient";
-        final String sender = "sender";
-        final TellMessage tellMessage = new TellMessage(sender, recipient, message);
-
-        assertThat(tellMessage.getSender()).as(sender).isEqualTo(sender);
-        assertThat(tellMessage.getRecipient()).as(recipient).isEqualTo(recipient);
-        assertThat(tellMessage.getMessage()).as(message).isEqualTo(message);
-        assertThat(isValidDate(tellMessage.getQueued())).as("queued is valid date/time").isTrue();
-
-        assertThat(tellMessage.isMatch(sender)).as("match sender").isTrue();
-        assertThat(tellMessage.isMatch(recipient)).as("match recipient").isTrue();
-        assertThat(tellMessage.isMatch("foo")).as("foo is no match").isFalse();
-
-        assertThat(tellMessage.isMatchId(tellMessage.getId())).as("is match ID").isTrue();
-
-        tellMessage.setIsReceived();
-        assertThat(tellMessage.isReceived()).as("is received").isTrue();
-        assertThat(isValidDate(tellMessage.getReceived())).as("received is valid date/time").isTrue();
-
-        tellMessage.setIsNotified();
-        assertThat(tellMessage.isNotified()).as("is notified").isTrue();
-    }
-}
-
diff --git a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
new file mode 100644
index 0000000..5dbf7f3
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -0,0 +1,68 @@
+/*
+ * TellMessageTest.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.commands.tell
+
+import java.time.temporal.Temporal
+import java.time.LocalDateTime
+import org.assertj.core.api.Assertions
+import org.testng.annotations.Test
+import java.time.Duration
+
+/**
+ * The `TellMessageTest` class.
+ */
+class TellMessageTest {
+    private fun isValidDate(date: Temporal): Boolean {
+        return Duration.between(date, LocalDateTime.now()).toMinutes() < 1
+    }
+
+    @Test
+    fun testTellMessage() {
+        val message = "Test message."
+        val recipient = "recipient"
+        val sender = "sender"
+        val tellMessage = TellMessage(sender, recipient, message)
+        Assertions.assertThat(tellMessage.sender).`as`(sender).isEqualTo(sender)
+        Assertions.assertThat(tellMessage.recipient).`as`(recipient).isEqualTo(recipient)
+        Assertions.assertThat(tellMessage.message).`as`(message).isEqualTo(message)
+        Assertions.assertThat(isValidDate(tellMessage.queued)).`as`("queued is valid date/time").isTrue
+        Assertions.assertThat(tellMessage.isMatch(sender)).`as`("match sender").isTrue
+        Assertions.assertThat(tellMessage.isMatch(recipient)).`as`("match recipient").isTrue
+        Assertions.assertThat(tellMessage.isMatch("foo")).`as`("foo is no match").isFalse
+        Assertions.assertThat(tellMessage.isMatchId(tellMessage.id)).`as`("is match ID").isTrue
+        tellMessage.isReceived = true
+        Assertions.assertThat(tellMessage.isReceived).`as`("is received").isTrue
+        Assertions.assertThat(isValidDate(tellMessage.receptionDate)).`as`("received is valid date/time").isTrue
+        tellMessage.isNotified = true
+        Assertions.assertThat(tellMessage.isNotified).`as`("is notified").isTrue
+    }
+}

From a44b0c1f49e9bb14c410091fb483b36b95b21053 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 4 Dec 2020 15:50:03 -0800
Subject: [PATCH 097/262] Version 0.8.0-beta+305

---
 .../java/net/thauvin/erik/mobibot/ReleaseInfo.java          | 6 +++---
 version.properties                                          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
index 654713c..900222b 100644
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
@@ -13,14 +13,14 @@ import java.time.*;
  */
 public final class ReleaseInfo {
     public static final String PROJECT = "mobibot";
-    public static final String VERSION = "0.8.0-beta+302";
+    public static final String VERSION = "0.8.0-beta+305";
     public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1607079230723L), ZoneId.systemDefault());
+        LocalDateTime.ofInstant(Instant.ofEpochMilli(1607122730368L), ZoneId.systemDefault());
 
     public static final int MAJOR = 0;
     public static final int MINOR = 8;
     public static final int PATCH = 0;
-    public static final String BUILDMETA = "302";
+    public static final String BUILDMETA = "305";
     public static final String PRERELEASE = "beta";
 
     public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
diff --git a/version.properties b/version.properties
index 375622b..25393d2 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Dec 04 02:53:48 PST 2020
-version.buildmeta=302
+#Fri Dec 04 15:43:01 PST 2020
+version.buildmeta=312
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+302
+version.semver=0.8.0-beta+312

From 69441f7006ebe39e6096ca64ae35e598ceb02731 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 4 Dec 2020 23:11:39 -0800
Subject: [PATCH 098/262] Converted Mobibot class to Kotlin.

---
 .idea/compiler.xml                            |  11 -
 .idea/mobibot.iml                             |   2 +-
 .idea/modules/mobibot.main.iml                |  83 +-
 .idea/modules/mobibot.test.iml                |  26 +-
 ReleaseInfo.mustache                          |  32 +
 build.gradle                                  |  13 +-
 config/detekt/baseline.xml                    |  16 +-
 mobibot.mustache                              |  36 -
 .../net/thauvin/erik/mobibot/ReleaseInfo.java |  36 -
 .../net/thauvin/erik/mobibot/Mobibot.java     | 956 ------------------
 .../java/net/thauvin/erik/mobibot/Mobibot.kt  | 776 ++++++++++++++
 .../erik/mobibot/commands/links/Posting.kt    |   2 +-
 .../erik/mobibot/commands/tell/Tell.kt        |   8 +-
 .../erik/mobibot/commands/tell/TellMessage.kt |  12 +-
 .../mobibot/commands/tell/TellMessagesMgr.kt  |   9 +-
 .../erik/mobibot/entries/EntriesMgr.kt        |   5 +-
 .../thauvin/erik/mobibot/entries/EntryLink.kt |  10 +-
 .../erik/mobibot/modules/AbstractModule.kt    |   5 +-
 .../net/thauvin/erik/mobibot/modules/Calc.kt  |   3 +-
 .../erik/mobibot/modules/CurrencyConverter.kt |   8 +-
 .../erik/mobibot/modules/GoogleSearch.kt      |   2 +-
 .../net/thauvin/erik/mobibot/modules/Joke.kt  |  12 +-
 .../erik/mobibot/modules/StockQuote.kt        |   5 +-
 .../thauvin/erik/mobibot/modules/Twitter.kt   |   3 +-
 .../thauvin/erik/mobibot/modules/Weather2.kt  |   3 +-
 .../thauvin/erik/mobibot/modules/WorldTime.kt |   2 +-
 .../mobibot/commands/tell/TellMessageTest.kt  |   4 +-
 .../erik/mobibot/modules/GoogleSearchTest.kt  |   2 +-
 .../erik/mobibot/modules/StockQuoteTest.kt    |   2 +-
 version.properties                            |   6 +-
 30 files changed, 956 insertions(+), 1134 deletions(-)
 create mode 100644 ReleaseInfo.mustache
 delete mode 100644 mobibot.mustache
 delete mode 100644 src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/Mobibot.java
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/Mobibot.kt

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1f720ec..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Gradle Imported" enabled="true">
-        <outputRelativeToContentRoot value="true" />
-        <option name="semver.project.dir" value="$PROJECT_DIR$" />
-        <processorPath useClasspath="false">
-          <entry name="$MAVEN_REPOSITORY$/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/github/spullara/mustache/java/compiler/0.9.6/compiler-0.9.6.jar" />
-        </processorPath>
-        <module name="mobibot.main" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 51a4995..85e216a 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+287" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+327" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index c6fe00f..4c00984 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+287" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+327" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -20,6 +20,9 @@
           </option>
           <option name="pluginClasspaths">
             <array>
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.4.20/fc1d26586910b32d676480c75acd3e922e5e81fa/kotlin-compiler-embeddable-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.4.20/a051291fb01bf2397759625626fec670cd57b3f0/kotlin-daemon-embeddable-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.4.20/411fc46e908bfa9c034f52b0d31b2e1f61f06127/kotlin-reflect-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.20/9793d2f6b262847a2d8127951c5786cf907cc7b1/kotlin-script-runtime-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.20/2e2bf29688a76cec111df56bc5e358c5bbc5057/kotlin-scripting-common-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.20/83704fbbe39946cc2ac6d0f07f41947abeb8dc20/kotlin-scripting-jvm-1.4.20.jar" />
@@ -27,6 +30,7 @@
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar" />
               <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+              <option value="$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar" />
             </array>
           </option>
           <option name="errors">
@@ -39,46 +43,59 @@
   <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/../../build/classes/java/main" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src/generated/java">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/generated/java" isTestSource="false" generated="true" />
+    <content url="file://$MODULE_DIR$/../../build/generated/source/kapt/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/kapt/main" isTestSource="false" generated="true" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../build/generated/source/kaptKotlin/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/kaptKotlin/main" isTestSource="false" generated="true" />
     </content>
     <content url="file://$MODULE_DIR$/../../src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
+    <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
+    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
+    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
+    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="Gradle: kaptGeneratedClasses">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../build/tmp/kapt3/classes/main" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.20" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
-    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.6" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index f864b22..822bffe 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+287" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+327" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.18.1/aaa02680dd92a568a4278bb40aa4a6305f632ec0/assertj-core-3.18.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/media/erik/Projects/java/mobibot/build/tmp/kapt3/classes/main:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.18.1/aaa02680dd92a568a4278bb40aa4a6305f632ec0/assertj-core-3.18.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -17,6 +17,7 @@
             <array>
               <option value="$MODULE_DIR$/../../build/classes/java/main" />
               <option value="$MODULE_DIR$/../../build/classes/kotlin/main" />
+              <option value="$MODULE_DIR$/../../build/tmp/kapt3/classes/main" />
               <option value="$MODULE_DIR$/../../build/libs/mobibot.jar" />
             </array>
           </option>
@@ -27,6 +28,9 @@
           </option>
           <option name="pluginClasspaths">
             <array>
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.4.20/fc1d26586910b32d676480c75acd3e922e5e81fa/kotlin-compiler-embeddable-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.4.20/a051291fb01bf2397759625626fec670cd57b3f0/kotlin-daemon-embeddable-1.4.20.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.4.20/411fc46e908bfa9c034f52b0d31b2e1f61f06127/kotlin-reflect-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.20/9793d2f6b262847a2d8127951c5786cf907cc7b1/kotlin-script-runtime-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.20/2e2bf29688a76cec111df56bc5e358c5bbc5057/kotlin-scripting-common-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.20/83704fbbe39946cc2ac6d0f07f41947abeb8dc20/kotlin-scripting-jvm-1.4.20.jar" />
@@ -34,6 +38,7 @@
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar" />
               <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar" />
               <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
+              <option value="$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar" />
             </array>
           </option>
           <option name="errors">
@@ -46,6 +51,12 @@
   <component name="NewModuleRootManager">
     <output-test url="file://$MODULE_DIR$/../../build/classes/java/test" />
     <exclude-output />
+    <content url="file://$MODULE_DIR$/../../build/generated/source/kapt/test">
+      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/kapt/test" isTestSource="true" generated="true" />
+    </content>
+    <content url="file://$MODULE_DIR$/../../build/generated/source/kaptKotlin/test">
+      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/kaptKotlin/test" isTestSource="true" generated="true" />
+    </content>
     <content url="file://$MODULE_DIR$/../../src/test">
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
@@ -53,10 +64,20 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="Gradle: kaptGeneratedClasses">
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/../../build/tmp/kapt3/classes/test" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module" module-name="mobibot.main" />
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.20" level="project" />
+    <orderEntry type="library" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
     <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
     <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
@@ -100,6 +121,7 @@
     <orderEntry type="library" name="Gradle: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
     <orderEntry type="library" name="Gradle: com.google.j2objc:j2objc-annotations:1.1" level="project" />
     <orderEntry type="library" name="Gradle: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.6" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="mobibot.main" />
 </module>
\ No newline at end of file
diff --git a/ReleaseInfo.mustache b/ReleaseInfo.mustache
new file mode 100644
index 0000000..b2672e4
--- /dev/null
+++ b/ReleaseInfo.mustache
@@ -0,0 +1,32 @@
+/*
+* This file is automatically generated.
+* Do not modify! -- ALL CHANGES WILL BE ERASED!
+*/
+package {{packageName}}
+
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.Instant
+
+/**
+* Provides semantic version information.
+*
+* @author [Semantic Version Annotation Processor](https://github.com/ethauvin/semver)
+*/
+object ReleaseInfo{
+    const val PROJECT = "{{project}}"
+    const val VERSION = "{{version}}"
+  
+    @JvmField
+    val BUILDDATE = LocalDateTime.ofInstant(Instant.ofEpochMilli({{epoch}}L), ZoneId.systemDefault())
+
+    const val MAJOR = {{major}}
+    const val MINOR = {{minor}}
+    const val PATCH = {{patch}}
+    const val BUILDMETA = "{{buildMeta}}"
+    const val PRERELEASE = "{{preRelease}}"
+
+    const val WEBSITE = "https://www.mobitopia.org/mobibot/"
+    const val AUTHOR = "Erik C. Thauvin"
+    const val AUTHOR_URL = "https://erik.thauvin.net/"
+}
diff --git a/build.gradle b/build.gradle
index 6b905f9..9ff3602 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,7 @@ plugins {
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
     id 'org.jetbrains.kotlin.jvm' version '1.4.20'
+    id 'org.jetbrains.kotlin.kapt' version '1.4.20'
     id 'org.sonarqube' version '3.0'
     id 'pmd'
 }
@@ -33,8 +34,8 @@ repositories {
 }
 
 dependencies {
-    annotationProcessor semverProcessor
-    compileOnly semverProcessor
+    kapt(semverProcessor)
+    implementation(semverProcessor)
 
     implementation 'pircbot:pircbot:1.5.0'
     compileOnly 'pircbot:pircbot:1.5.0:sources'
@@ -77,14 +78,18 @@ java {
     targetCompatibility = JavaVersion.VERSION_11
 }
 
+kapt {
+    arguments {
+        arg("semver.project.dir", projectDir)
+    }
+}
+
 application {
     mainClassName = packageName + '.Mobibot'
 }
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
-    options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
-    options.compilerArgs += ["-Asemver.project.dir=$projectDir"]
 }
 
 compileJava {
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 59b5db4..46ddfa2 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -3,8 +3,10 @@
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
     <ID>ComplexMethod:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
+    <ID>ComplexMethod:Mobibot.kt$Mobibot$override fun onPrivateMessage( sender: String, login: String, hostname: String, message: String )</ID>
     <ID>ComplexMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongMethod:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
+    <ID>LongMethod:Mobibot.kt$Mobibot.Companion$ @JvmStatic fun main(args: Array&lt;String&gt;)</ID>
     <ID>LongMethod:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
@@ -22,6 +24,11 @@
     <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
     <ID>MagicNumber:Dice.kt$Dice$7</ID>
     <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$10</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$1000L</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$3</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$5</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$8</ID>
     <ID>MagicNumber:Modules.kt$Modules$7</ID>
     <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
     <ID>MagicNumber:Tell.kt$Tell$50</ID>
@@ -50,11 +57,14 @@
     <ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
     <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ @Throws(IOException::class, FeedException::class) fun loadEntries(file: String, channel: String, entries: ArrayList&lt;EntryLink&gt;): String</ID>
     <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
-    <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ fun setTags(tags: List&lt;String?&gt;)</ID>
+    <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ private fun setTags(tags: List&lt;String?&gt;)</ID>
     <ID>NestedBlockDepth:FeedReader.kt$FeedReader$ override fun run()</ID>
     <ID>NestedBlockDepth:GoogleSearch.kt$GoogleSearch$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
     <ID>NestedBlockDepth:Lookup.kt$Lookup$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
+    <ID>NestedBlockDepth:Mobibot.kt$Mobibot$ fun connect()</ID>
+    <ID>NestedBlockDepth:Mobibot.kt$Mobibot$override fun onMessage( channel: String, sender: String, login: String, hostname: String, message: String )</ID>
+    <ID>NestedBlockDepth:Mobibot.kt$Mobibot$override fun onPrivateMessage( sender: String, login: String, hostname: String, message: String )</ID>
     <ID>NestedBlockDepth:StockQuote.kt$StockQuote$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:Tell.kt$Tell$ @JvmOverloads fun send(nickname: String, isMessage: Boolean = false)</ID>
@@ -63,14 +73,18 @@
     <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
+    <ID>ReturnCount:Mobibot.kt$Mobibot$override fun onMessage( channel: String, sender: String, login: String, hostname: String, message: String )</ID>
     <ID>ReturnCount:Utils.kt$Utils.Companion$ @JvmStatic fun colorize(s: String?, color: String): String</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
     <ID>ThrowsCount:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>TooGenericExceptionCaught:FeedReader.kt$FeedReader$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$ex: Exception</ID>
     <ID>TooGenericExceptionCaught:StockQuote.kt$StockQuote.Companion$e: NullPointerException</ID>
     <ID>TooGenericExceptionCaught:Weather2.kt$Weather2.Companion$e: NullPointerException</ID>
+    <ID>TooManyFunctions:Mobibot.kt$Mobibot : PircBot</ID>
     <ID>TooManyFunctions:Tell.kt$Tell : AbstractCommand</ID>
     <ID>TooManyFunctions:Utils.kt$Utils$Companion</ID>
   </CurrentIssues>
diff --git a/mobibot.mustache b/mobibot.mustache
deleted file mode 100644
index a090f01..0000000
--- a/mobibot.mustache
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is automatically generated.
- * Do not modify! -- ALL CHANGES WILL BE ERASED!
- */
-package {{packageName}};
-
-import java.time.*;
-
-/**
- * Provides semantic version information.
- *
- * @author <a href="https://github.com/ethauvin/semver">Semantic Version Annotation Processor</a>
- */
-public final class {{className}} {
-    public static final String PROJECT = "{{project}}";
-    public static final String VERSION = "{{version}}";
-    public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli({{epoch}}L), ZoneId.systemDefault());
-
-    public static final int MAJOR = {{major}};
-    public static final int MINOR = {{minor}};
-    public static final int PATCH = {{patch}};
-    public static final String BUILDMETA = "{{buildMeta}}";
-    public static final String PRERELEASE = "{{preRelease}}";
-
-    public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
-    public static final String AUTHOR = "Erik C. Thauvin";
-    public static final String AUTHOR_URL = "https://erik.thauvin.net/";
-
-    /**
-     * Disables the default constructor.
-     */
-    private {{className}}() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
-}
diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
deleted file mode 100644
index 900222b..0000000
--- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is automatically generated.
- * Do not modify! -- ALL CHANGES WILL BE ERASED!
- */
-package net.thauvin.erik.mobibot;
-
-import java.time.*;
-
-/**
- * Provides semantic version information.
- *
- * @author <a href="https://github.com/ethauvin/semver">Semantic Version Annotation Processor</a>
- */
-public final class ReleaseInfo {
-    public static final String PROJECT = "mobibot";
-    public static final String VERSION = "0.8.0-beta+305";
-    public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli(1607122730368L), ZoneId.systemDefault());
-
-    public static final int MAJOR = 0;
-    public static final int MINOR = 8;
-    public static final int PATCH = 0;
-    public static final String BUILDMETA = "305";
-    public static final String PRERELEASE = "beta";
-
-    public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
-    public static final String AUTHOR = "Erik C. Thauvin";
-    public static final String AUTHOR_URL = "https://erik.thauvin.net/";
-
-    /**
-     * Disables the default constructor.
-     */
-    private ReleaseInfo() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java b/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
deleted file mode 100644
index 420833d..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.java
+++ /dev/null
@@ -1,956 +0,0 @@
-/*
- * Mobibot.java
- *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import net.thauvin.erik.mobibot.commands.AbstractCommand;
-import net.thauvin.erik.mobibot.commands.AddLog;
-import net.thauvin.erik.mobibot.commands.ChannelFeed;
-import net.thauvin.erik.mobibot.commands.Cycle;
-import net.thauvin.erik.mobibot.commands.Ignore;
-import net.thauvin.erik.mobibot.commands.Info;
-import net.thauvin.erik.mobibot.commands.Me;
-import net.thauvin.erik.mobibot.commands.Modules;
-import net.thauvin.erik.mobibot.commands.Msg;
-import net.thauvin.erik.mobibot.commands.Nick;
-import net.thauvin.erik.mobibot.commands.Recap;
-import net.thauvin.erik.mobibot.commands.Say;
-import net.thauvin.erik.mobibot.commands.Users;
-import net.thauvin.erik.mobibot.commands.Versions;
-import net.thauvin.erik.mobibot.commands.links.Comment;
-import net.thauvin.erik.mobibot.commands.links.LinksMgr;
-import net.thauvin.erik.mobibot.commands.links.Posting;
-import net.thauvin.erik.mobibot.commands.links.Tags;
-import net.thauvin.erik.mobibot.commands.links.View;
-import net.thauvin.erik.mobibot.commands.tell.Tell;
-import net.thauvin.erik.mobibot.entries.EntriesMgr;
-import net.thauvin.erik.mobibot.entries.EntryLink;
-import net.thauvin.erik.mobibot.modules.AbstractModule;
-import net.thauvin.erik.mobibot.modules.Calc;
-import net.thauvin.erik.mobibot.modules.CurrencyConverter;
-import net.thauvin.erik.mobibot.modules.Dice;
-import net.thauvin.erik.mobibot.modules.GoogleSearch;
-import net.thauvin.erik.mobibot.modules.Joke;
-import net.thauvin.erik.mobibot.modules.Lookup;
-import net.thauvin.erik.mobibot.modules.Ping;
-import net.thauvin.erik.mobibot.modules.RockPaperScissors;
-import net.thauvin.erik.mobibot.modules.StockQuote;
-import net.thauvin.erik.mobibot.modules.Twitter;
-import net.thauvin.erik.mobibot.modules.War;
-import net.thauvin.erik.mobibot.modules.Weather2;
-import net.thauvin.erik.mobibot.modules.WorldTime;
-import net.thauvin.erik.mobibot.msg.Message;
-import net.thauvin.erik.pinboard.PinboardPoster;
-import net.thauvin.erik.semver.Version;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.config.Configurator;
-import org.jibble.pircbot.PircBot;
-import org.jibble.pircbot.User;
-
-import java.io.BufferedOutputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.List;
-import java.util.Properties;
-import java.util.Timer;
-import java.util.logging.ConsoleHandler;
-import java.util.regex.Pattern;
-
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.lowerCase;
-
-/**
- * Implements the #mobitopia bot.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created Jan 31, 2004
- * @since 1.0
- */
-@SuppressWarnings("WeakerAccess")
-@Version(properties = "version.properties",
-         className = "ReleaseInfo")
-public class Mobibot extends PircBot {
-    // Logger
-    private static final Logger LOGGER = LogManager.getLogger(Mobibot.class);
-    // Maximum number of times the bot will try to reconnect, if disconnected
-    private static final int MAX_RECONNECT = 10;
-    // Timer
-    private static final Timer TIMER = new Timer(true);
-    // Commands and Modules
-    private final Addons addons = new Addons();
-    // Main channel
-    private final String ircChannel;
-    // IRC port
-    private final int ircPort;
-    // IRC server
-    private final String ircServer;
-    // Logger default level
-    private final Level loggerLevel;
-    // Log directory
-    private final String logsDir;
-    // Tell command
-    private final Tell tell;
-    // Today's date
-    private final String today = Utils.today();
-    // Twitter module
-    private final Twitter twitter;
-    // Backlogs URL
-    private String backLogsUrl = "";
-    // Ident message
-    private String identMsg = "";
-    // Ident nick
-    private String identNick = "";
-    // NickServ ident password
-    private String identPwd = "";
-    // Pinboard posts handler
-    private PinboardPoster pinboard;
-    // Weblog URL
-    private String weblogUrl = "";
-
-    /**
-     * Creates a new {@link Mobibot} instance.
-     *
-     * @param channel     The irc channel.
-     * @param nickname    The bot's nickname.
-     * @param logsDirPath The path to the logs directory.
-     * @param p           The bot's properties.
-     */
-    public Mobibot(final String nickname, final String channel, final String logsDirPath, final Properties p) {
-        super();
-        System.getProperties().setProperty("sun.net.client.defaultConnectTimeout",
-                                           String.valueOf(Constants.CONNECT_TIMEOUT));
-        System.getProperties().setProperty("sun.net.client.defaultReadTimeout",
-                                           String.valueOf(Constants.CONNECT_TIMEOUT));
-
-        setName(nickname);
-
-        ircServer = p.getProperty("server", Constants.DEFAULT_SERVER);
-        ircPort = Utils.getIntProperty(p.getProperty("port"), Constants.DEFAULT_PORT);
-        ircChannel = channel;
-        logsDir = logsDirPath;
-
-        // Set the logger level
-        loggerLevel = LOGGER.getLevel();
-
-        // Load the current entries and backlogs, if any
-        try {
-            LinksMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, ircChannel);
-            LOGGER.debug("Last feed: {}", LinksMgr.getStartDate());
-        } catch (Exception e) {
-            LOGGER.error("An error occurred while loading the logs.", e);
-        }
-
-        // Initialize the bot
-        setVerbose(true);
-        setAutoNickChange(true);
-        setLogin(p.getProperty("login", getName()));
-        setVersion(ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION);
-        // setMessageDelay(1000);
-        setIdentity(p.getProperty("ident", ""), p.getProperty("ident-nick", ""), p.getProperty("ident-msg", ""));
-
-        // Set the URLs
-        setWeblogUrl(p.getProperty("weblog", ""));
-        setBacklogsUrl(Utils.ensureDir(p.getProperty("backlogs", weblogUrl), true));
-
-        // Set the pinboard authentication
-        setPinboardAuth(p.getProperty("pinboard-api-token"));
-
-        // Load the commands
-        addons.add(new AddLog(this), p);
-        addons.add(new ChannelFeed(this, getChannelName()), p);
-        addons.add(new Cycle(this), p);
-        addons.add(new Ignore(this), p);
-        addons.add(new Info(this), p);
-        addons.add(new Me(this), p);
-        addons.add(new Modules(this), p);
-        addons.add(new Msg(this), p);
-        addons.add(new Nick(this), p);
-        addons.add(new Recap(this), p);
-        addons.add(new Say(this), p);
-        addons.add(new Users(this), p);
-        addons.add(new Versions(this), p);
-
-        // Tell command
-        tell = new Tell(this);
-        addons.add(tell, p);
-
-        // Load the links commands
-        addons.add(new Comment(this), p);
-        addons.add(new Posting(this), p);
-        addons.add(new Tags(this), p);
-        addons.add(new LinksMgr(this), p);
-        addons.add(new View(this), p);
-
-        // Load the modules
-        addons.add(new Calc(this), p);
-        addons.add(new CurrencyConverter(this), p);
-        addons.add(new Dice(this), p);
-        addons.add(new GoogleSearch(this), p);
-        addons.add(new Joke(this), p);
-        addons.add(new Lookup(this), p);
-        addons.add(new Ping(this), p);
-        addons.add(new RockPaperScissors(this), p);
-        addons.add(new StockQuote(this), p);
-        addons.add(new War(this), p);
-        addons.add(new Weather2(this), p);
-        addons.add(new WorldTime(this), p);
-
-        // Twitter module
-        twitter = new Twitter(this);
-        addons.add(twitter, p);
-
-        // Sort the addons
-        addons.sort();
-
-        // Save the entries
-        LinksMgr.saveEntries(this, true);
-    }
-
-    /**
-     * The Truth Is Out There...
-     *
-     * @param args The command line arguments.
-     */
-    @SuppressFBWarnings(
-            { "INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE",
-              "DM_DEFAULT_ENCODING",
-              "IOI_USE_OF_FILE_STREAM_CONSTRUCTORS" })
-    @SuppressWarnings({ "PMD.SystemPrintln", "PMD.AvoidFileStream", "PMD.CloseResource" })
-    public static void main(final String[] args) {
-        // Setup the command line options
-        final Options options = new Options()
-                                        .addOption(Constants.HELP_ARG.substring(0, 1),
-                                                   Constants.HELP_ARG,
-                                                   false,
-                                                   "print this help message")
-                                        .addOption(Constants.DEBUG_ARG.substring(0, 1), Constants.DEBUG_ARG, false,
-                                                   "print debug & logging data directly to the console")
-                                        .addOption(Option.builder(Constants.PROPS_ARG.substring(0, 1)).hasArg()
-                                                         .argName("file")
-                                                         .desc("use " + "alternate properties file")
-                                                         .longOpt(Constants.PROPS_ARG).build())
-                                        .addOption(Constants.VERSION_ARG.substring(0, 1),
-                                                   Constants.VERSION_ARG,
-                                                   false,
-                                                   "print version info");
-
-        // Parse the command line
-        final CommandLineParser parser = new DefaultParser();
-        CommandLine commandLine = null;
-
-        try {
-            commandLine = parser.parse(options, args);
-        } catch (ParseException e) {
-            System.err.println("CLI Parsing failed.  Reason: " + e.getMessage());
-            e.printStackTrace(System.err);
-            System.exit(1);
-        }
-
-        if (commandLine.hasOption(Constants.HELP_ARG.charAt(0))) {
-            // Output the usage
-            new HelpFormatter().printHelp(Mobibot.class.getName(), options);
-        } else if (commandLine.hasOption(Constants.VERSION_ARG.charAt(0))) {
-            System.out.println(ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION
-                               + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')');
-            System.out.println(ReleaseInfo.WEBSITE);
-        } else {
-            final Properties p = new Properties();
-            try (final InputStream fis = Files.newInputStream(
-                    Paths.get(commandLine.getOptionValue(Constants.PROPS_ARG.charAt(0), "./mobibot.properties")))) {
-                // Load the properties files
-                p.load(fis);
-            } catch (FileNotFoundException e) {
-                System.err.println("Unable to find properties file.");
-                e.printStackTrace(System.err);
-                System.exit(1);
-            } catch (IOException e) {
-                System.err.println("Unable to open properties file.");
-                e.printStackTrace(System.err);
-                System.exit(1);
-            }
-
-            final String nickname = p.getProperty("nick", lowerCase(Mobibot.class.getName()));
-            final String channel = p.getProperty("channel");
-            final String logsDir = Utils.ensureDir(p.getProperty("logs", "."), false);
-
-            // Redirect the stdout and stderr
-            if (!commandLine.hasOption(Constants.DEBUG_ARG.charAt(0))) {
-                try {
-                    final PrintStream stdout = new PrintStream(new BufferedOutputStream(new FileOutputStream(
-                            logsDir + channel.substring(1) + '.' + Utils.today() + ".log", true)), true);
-                    System.setOut(stdout);
-                } catch (IOException e) {
-                    System.err.println("Unable to open output (stdout) log file.");
-                    e.printStackTrace(System.err);
-                    System.exit(1);
-                }
-
-                try {
-                    final PrintStream stderr =
-                            new PrintStream(new BufferedOutputStream(
-                                    new FileOutputStream(logsDir + nickname + ".err", true)), true);
-                    System.setErr(stderr);
-                } catch (IOException e) {
-                    System.err.println("Unable to open error (stderr) log file.");
-                    e.printStackTrace(System.err);
-                    System.exit(1);
-                }
-            }
-
-            // Create the bot
-            final Mobibot bot = new Mobibot(nickname, channel, logsDir, p);
-
-            // Connect
-            bot.connect();
-        }
-    }
-
-    /**
-     * Sends an action to the current channel.
-     *
-     * @param action The action.
-     */
-    public final void action(final String action) {
-        action(ircChannel, action);
-    }
-
-    /**
-     * Sends an action to the channel.
-     *
-     * @param channel The channel.
-     * @param action  The action.
-     */
-    private void action(final String channel, final String action) {
-        if (isNotBlank(channel) && isNotBlank(action)) {
-            sendAction(channel, action);
-        }
-    }
-
-    /**
-     * Adds pin on pinboard.
-     *
-     * @param entry The entry to add.
-     */
-    public final void addPin(final EntryLink entry) {
-        if (pinboard != null) {
-            PinboardUtils.addPin(pinboard, ircServer, entry);
-        }
-    }
-
-    /**
-     * Connects to the server and joins the channel.
-     */
-    @SuppressFBWarnings({ "DM_EXIT", "INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE" })
-    public final void connect() {
-        try {
-            connect(ircServer, ircPort);
-        } catch (Exception e) {
-            int retries = 0;
-
-            while ((retries++ < MAX_RECONNECT) && !isConnected()) {
-                sleep(10);
-
-                try {
-                    connect(ircServer, ircPort);
-                } catch (Exception ex) {
-                    if (retries == MAX_RECONNECT) {
-                        LOGGER.debug("Unable to reconnect to {} after {} retries.", ircServer, MAX_RECONNECT, ex);
-                        e.printStackTrace(System.err);
-                        System.exit(1);
-                    }
-                }
-            }
-        }
-        identify();
-        joinChannel();
-    }
-
-    /**
-     * Deletes pin on pinboard.
-     *
-     * @param entry The entry to delete.
-     */
-    public final void deletePin(final int index, final EntryLink entry) {
-        if (pinboard != null) {
-            PinboardUtils.deletePin(pinboard, entry);
-        }
-        if (twitter.isAutoPost()) {
-            twitter.removeEntry(index);
-        }
-    }
-
-    /**
-     * Returns the backlogs URL.
-     *
-     * @return The backlogs URL.
-     */
-    public final String getBacklogsUrl() {
-        return backLogsUrl;
-    }
-
-    /**
-     * Returns the current channel.
-     *
-     * @return The current channel.
-     */
-    public final String getChannel() {
-        return ircChannel;
-    }
-
-    /**
-     * Returns the current channel name.
-     *
-     * @return The current channel name.
-     */
-    @SuppressFBWarnings("STT_STRING_PARSING_A_FIELD")
-    public final String getChannelName() {
-        return ircChannel.substring(1);
-    }
-
-    /**
-     * Returns the irc server.
-     *
-     * @return The irc server.
-     */
-    public final String getIrcServer() {
-        return ircServer;
-    }
-
-    /**
-     * Returns the bot's logger.
-     *
-     * @return The bot's logger.
-     */
-    public final Logger getLogger() {
-        return LOGGER;
-    }
-
-    /**
-     * Returns the log directory.
-     *
-     * @return the log directory.
-     */
-    public final String getLogsDir() {
-        return logsDir;
-    }
-
-    /**
-     * Returns the enabled modules names.
-     *
-     * @return The modules names.
-     */
-    public final List<String> getModulesNames() {
-        return addons.getModulesNames();
-    }
-
-    /**
-     * Returns the Tell command.
-     *
-     * @return The tell command.
-     */
-    public final Tell getTell() {
-        return tell;
-    }
-
-    /**
-     * Returns the bot's timer.
-     *
-     * @return The timer.
-     */
-    public final Timer getTimer() {
-        return TIMER;
-    }
-
-    /**
-     * Get today's date for the feed.
-     *
-     * @return Today's date.
-     */
-    public String getToday() {
-        return today;
-    }
-
-    /**
-     * Returns the Twitter command.
-     *
-     * @return The Twitter command.
-     */
-    public final Twitter getTwitter() {
-        return twitter;
-    }
-
-    /**
-     * Returns the weblog URL.
-     *
-     * @return The weblog URL.
-     */
-    public final String getWeblogUrl() {
-        return weblogUrl;
-    }
-
-    /**
-     * Responds with the commands help, if any.
-     *
-     * @param sender    The nick of the person requesting Constants.
-     * @param topic     The help topic.
-     * @param isPrivate The private flag.
-     * @return {@code true} if the topic was found, {@code false} otherwise.
-     */
-    private boolean helpCommands(final String sender, final String topic, final boolean isPrivate) {
-        for (final AbstractCommand command : addons.getCommands()) {
-            if (command.isVisible() && command.getName().startsWith(topic)) {
-                return command.helpResponse(topic, sender, isOp(sender), isPrivate);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Responds with the default Constants.
-     *
-     * @param sender    The nick of the person requesting Constants.
-     * @param isOp      The channel operator flag.
-     * @param isPrivate The private flag.
-     */
-    public void helpDefault(final String sender, final boolean isOp, final boolean isPrivate) {
-        send(sender, "Type a URL on " + ircChannel + " to post it.", isPrivate);
-        send(sender, "For more information on a specific command, type:", isPrivate);
-        send(sender,
-             Utils.helpIndent(Utils.helpFormat("%c " + Constants.HELP_CMD + " <command>", getNick(), isPrivate)),
-             isPrivate);
-        send(sender, "The commands are:", isPrivate);
-        sendList(sender, addons.getNames(), 8, isPrivate, true);
-        if (isOp) {
-            send(sender, "The op commands are:", isPrivate);
-            sendList(sender, addons.getOps(), 8, isPrivate, true);
-        }
-    }
-
-    /**
-     * Responds with the modules help, if any.
-     *
-     * @param sender    The nick of the person requesting Constants.
-     * @param topic     The help topic.
-     * @param isPrivate The private flag.
-     * @return {@code true} if the topic was found, {@code false} otherwise.
-     */
-    private boolean helpModules(final String sender, final String topic, final boolean isPrivate) {
-        for (final AbstractModule module : addons.getModules()) {
-            for (final String cmd : module.commands) {
-                if (topic.equals(cmd)) {
-                    module.helpResponse(sender, isPrivate);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Responds with the bot's Constants.
-     *
-     * @param sender    The nick of the person who sent the private message.
-     * @param topic     The help topic, if any.
-     * @param isPrivate The private flag.
-     */
-    private void helpResponse(final String sender, final String topic, final boolean isPrivate) {
-        final boolean isOp = isOp(sender);
-        if (StringUtils.isBlank(topic)) {
-            helpDefault(sender, isOp, isPrivate);
-        } else {
-            // Command, Modules or Default
-            if (!helpCommands(sender, topic, isPrivate) && !helpModules(sender, lowerCase(topic).trim(), isPrivate)) {
-                helpDefault(sender, isOp, isPrivate);
-            }
-        }
-    }
-
-    /**
-     * Identifies the bot.
-     */
-    private void identify() {
-        // Identify with NickServ
-        if (isNotBlank(identPwd)) {
-            identify(identPwd);
-        }
-
-        // Identify with a specified nick
-        if (isNotBlank(identNick) && isNotBlank(identMsg)) {
-            sendMessage(identNick, identMsg);
-        }
-    }
-
-    /**
-     * Returns <code>true</code> if the specified sender is an Op on the {@link #ircChannel channel}.
-     *
-     * @param sender The sender.
-     * @return true, if the sender is an Op.
-     */
-    public boolean isOp(final String sender) {
-        final User[] users = getUsers(ircChannel);
-
-        for (final User user : users) {
-            if (user.getNick().equals(sender)) {
-                return user.isOp();
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Joins the bot's channel.
-     */
-    public final void joinChannel() {
-        joinChannel(ircChannel);
-        twitter.notification(getName() + " " + ReleaseInfo.VERSION + " has joined " + getChannel());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected final void onDisconnect() {
-        if (isNotBlank(weblogUrl)) {
-            setVersion(weblogUrl);
-        }
-        sleep(5);
-        connect();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @SuppressFBWarnings(value = "CC_CYCLOMATIC_COMPLEXITY",
-                        justification = "Working on it.")
-    @Override
-    protected final void onMessage(final String channel, final String sender, final String login, final String hostname,
-                                   final String message) {
-        LOGGER.debug(">>> {} : {}", sender, message);
-
-        tell.send(sender, true);
-
-        if (message.matches("(?i)" + Pattern.quote(getNick()) + ":.*")) { // mobibot: <command>
-            final String[] cmds = message.substring(message.indexOf(':') + 1).trim().split(" ", 2);
-            final String cmd = lowerCase(cmds[0]);
-
-            String args = "";
-
-            if (cmds.length > 1) {
-                args = cmds[1].trim();
-            }
-
-            if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
-                helpResponse(sender, args, false);
-            } else {
-                // Commands
-                for (final AbstractCommand command : addons.getCommands()) {
-                    if (command.isPublic() && command.getName().startsWith(cmd)) {
-                        command.commandResponse(sender, login, args, isOp(sender), false);
-                        return;
-                    }
-                }
-                // Modules
-                for (final AbstractModule module : addons.getModules()) { // modules
-                    for (final String c : module.commands) {
-                        if (cmd.startsWith(c)) {
-                            module.commandResponse(sender, cmd, args, false);
-                            return;
-                        }
-                    }
-                }
-            }
-        } else {
-            // Commands, e.g.: https://www.example.com/
-            for (final AbstractCommand command : addons.getCommands()) {
-                if (command.matches(message)) {
-                    command.commandResponse(sender, login, message, isOp(sender), false);
-                    return;
-                }
-            }
-        }
-
-        Recap.storeRecap(sender, message, false);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @SuppressFBWarnings(value = { "DM_EXIT", "CC_CYCLOMATIC_COMPLEXITY" },
-                        justification = "Yes, we want to bail out.")
-    @Override
-    protected final void onPrivateMessage(final String sender, final String login, final String hostname,
-                                          final String message) {
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug(">>> {} : {}", sender, message);
-        }
-
-        final String[] cmds = message.split(" ", 2);
-        final String cmd = lowerCase(cmds[0]);
-        String args = "";
-
-        if (cmds.length > 1) {
-            args = cmds[1].trim();
-        }
-
-        final boolean isOp = isOp(sender);
-
-        if (cmd.startsWith(Constants.HELP_CMD)) { // help
-            helpResponse(sender, args, true);
-        } else if (isOp && "kill".equals(cmd)) { // kill
-            twitter.notification(getName() + " killed by " + sender + " on " + getChannel());
-            sendRawLine("QUIT : Poof!");
-            System.exit(0);
-        } else if (isOp && Constants.DEBUG_CMD.equals(cmd)) { // debug
-            if (LOGGER.isDebugEnabled()) {
-                Configurator.setLevel(LOGGER.getName(), loggerLevel);
-            } else {
-                Configurator.setLevel(LOGGER.getName(), Level.DEBUG);
-            }
-            send(sender, "Debug logging is " + (LOGGER.isDebugEnabled() ? "enabled." : "disabled."), true);
-        } else if (isOp && Constants.DIE_CMD.equals(cmd)) { // die
-            send(sender + " has just signed my death sentence.");
-            TIMER.cancel();
-            twitter.shutdown();
-            twitter.notification(getName() + " stopped by " + sender + " on " + getChannel());
-            sleep(3);
-            quitServer("The Bot Is Out There!");
-            System.exit(0);
-        } else {
-            for (final AbstractCommand command : addons.getCommands()) {
-                if (command.getName().startsWith(cmd)) {
-                    command.commandResponse(sender, login, args, isOp, true);
-                    return;
-                }
-            }
-            for (final AbstractModule module : addons.getModules()) {
-                if (module.isPrivateMsgEnabled()) {
-                    for (final String c : module.commands) {
-                        if (cmd.equals(c)) {
-                            module.commandResponse(sender, cmd, args, true);
-                            return;
-                        }
-                    }
-                }
-            }
-            helpDefault(sender, isOp, true);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected final void onAction(final String sender, final String login, final String hostname, final String target,
-                                  final String action) {
-        if (ircChannel.equals(target)) {
-            Recap.storeRecap(sender, action, true);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void onJoin(final String channel, final String sender, final String login, final String hostname) {
-        tell.send(sender);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void onNickChange(final String oldNick, final String login, final String hostname, final String newNick) {
-        tell.send(newNick);
-    }
-
-    /**
-     * Sends a private message or notice.
-     *
-     * @param sender    The channel or nick of the person who sent the message.
-     * @param message   The actual message.
-     * @param isPrivate Set to <code>true</code> if the response should be a private message, otherwise a notice is
-     *                  sent.
-     */
-    public final void send(final String sender, final String message, final boolean isPrivate) {
-        if (isNotBlank(message) && isNotBlank(sender)) {
-            if (isPrivate) {
-                LOGGER.debug("Sending message to {} : {}", sender, message);
-                sendMessage(sender, message);
-            } else {
-                LOGGER.debug("Sending notice to {} : {}", sender, message);
-                sendNotice(sender, message);
-            }
-        }
-    }
-
-    /**
-     * Sends a notice to the channel.
-     *
-     * @param notice The notice message.
-     */
-    public final void send(final String notice) {
-        send(getChannel(), notice, false);
-
-    }
-
-    /**
-     * Sends a message.
-     *
-     * @param who     The channel or nick of the person who sent the command.
-     * @param message The message.
-     */
-    public final void send(final String who, final Message message) {
-        send(message.isNotice() ? who : getChannel(), message.getMsg(), message.getColor(), message.isPrivate());
-    }
-
-    /**
-     * Sends a message.
-     *
-     * @param who       The channel or nick of the person who sent the command.
-     * @param message   The actual message.
-     * @param color     The message's color.
-     * @param isPrivate The private flag.
-     */
-    public final void send(final String who, final String message, final String color, final boolean isPrivate) {
-        send(who, Utils.colorize(message, color), isPrivate);
-    }
-
-    /**
-     * Send a formatted commands/modules, etc. list.
-     *
-     * @param nick      The nick to send the list to.
-     * @param list      The list to format.
-     * @param size      The number of items per line.
-     * @param isPrivate The private flag.
-     * @param isBold    The bold flag
-     */
-    public final void sendList(final String nick,
-                               final List<String> list,
-                               final int size,
-                               final boolean isPrivate,
-                               final boolean isBold) {
-        for (int i = 0; i < list.size(); i += size) {
-            send(nick, Utils.helpIndent(
-                    String.join(" ", list.subList(i, Math.min(list.size(), i + size))), isBold), isPrivate);
-        }
-    }
-
-    /**
-     * Sets the backlogs URL.
-     *
-     * @param url The backlogs URL.
-     */
-    final void setBacklogsUrl(final String url) {
-        backLogsUrl = url;
-    }
-
-    /**
-     * Sets the bot's identification.
-     *
-     * @param pwd  The password for NickServ, if any.
-     * @param nick The ident nick name.
-     * @param msg  The ident message.
-     */
-    final void setIdentity(final String pwd, final String nick, final String msg) {
-        identPwd = pwd;
-        identNick = nick;
-        identMsg = msg;
-    }
-
-    /**
-     * Sets the pinboard authentication.
-     *
-     * @param apiToken The API token
-     */
-    final void setPinboardAuth(final String apiToken) {
-        if (isNotBlank(apiToken)) {
-            pinboard = new PinboardPoster(apiToken);
-            if (LOGGER.isDebugEnabled()) {
-                final ConsoleHandler consoleHandler = new ConsoleHandler();
-                consoleHandler.setLevel(java.util.logging.Level.FINE);
-                pinboard.getLogger().addHandler(consoleHandler);
-                pinboard.getLogger().setLevel(java.util.logging.Level.FINE);
-            }
-        }
-    }
-
-    /**
-     * Sets the weblog URL.
-     *
-     * @param url The weblog URL.
-     */
-    final void setWeblogUrl(final String url) {
-        weblogUrl = url;
-    }
-
-    /**
-     * Sleeps for the specified number of seconds.
-     *
-     * @param secs The number of seconds to sleep for.
-     */
-    public final void sleep(final int secs) {
-        try {
-            Thread.sleep(secs * 1000L);
-        } catch (InterruptedException ignore) {
-            // Do nothing
-        }
-    }
-
-    /**
-     * Updates pin on pinboard.
-     *
-     * @param oldUrl The old pin url.
-     * @param entry  The entry to update.
-     */
-    public final void updatePin(final String oldUrl, final EntryLink entry) {
-        if (pinboard != null) {
-            PinboardUtils.updatePin(pinboard, ircServer, oldUrl, entry);
-        }
-    }
-}
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
new file mode 100644
index 0000000..a93f2ae
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -0,0 +1,776 @@
+/*
+ * Mobibot.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot
+
+import net.thauvin.erik.mobibot.PinboardUtils.addPin
+import net.thauvin.erik.mobibot.PinboardUtils.deletePin
+import net.thauvin.erik.mobibot.PinboardUtils.updatePin
+import net.thauvin.erik.mobibot.Utils.Companion.colorize
+import net.thauvin.erik.mobibot.Utils.Companion.ensureDir
+import net.thauvin.erik.mobibot.Utils.Companion.getIntProperty
+import net.thauvin.erik.mobibot.Utils.Companion.helpFormat
+import net.thauvin.erik.mobibot.Utils.Companion.helpIndent
+import net.thauvin.erik.mobibot.Utils.Companion.isoLocalDate
+import net.thauvin.erik.mobibot.Utils.Companion.today
+import net.thauvin.erik.mobibot.commands.AddLog
+import net.thauvin.erik.mobibot.commands.ChannelFeed
+import net.thauvin.erik.mobibot.commands.Cycle
+import net.thauvin.erik.mobibot.commands.Ignore
+import net.thauvin.erik.mobibot.commands.Info
+import net.thauvin.erik.mobibot.commands.Me
+import net.thauvin.erik.mobibot.commands.Modules
+import net.thauvin.erik.mobibot.commands.Msg
+import net.thauvin.erik.mobibot.commands.Nick
+import net.thauvin.erik.mobibot.commands.Recap
+import net.thauvin.erik.mobibot.commands.Recap.Companion.storeRecap
+import net.thauvin.erik.mobibot.commands.Say
+import net.thauvin.erik.mobibot.commands.Users
+import net.thauvin.erik.mobibot.commands.Versions
+import net.thauvin.erik.mobibot.commands.links.Comment
+import net.thauvin.erik.mobibot.commands.links.LinksMgr
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.saveEntries
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.startDate
+import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.startup
+import net.thauvin.erik.mobibot.commands.links.Posting
+import net.thauvin.erik.mobibot.commands.links.Tags
+import net.thauvin.erik.mobibot.commands.links.View
+import net.thauvin.erik.mobibot.commands.tell.Tell
+import net.thauvin.erik.mobibot.entries.EntriesMgr
+import net.thauvin.erik.mobibot.entries.EntryLink
+import net.thauvin.erik.mobibot.modules.Calc
+import net.thauvin.erik.mobibot.modules.CurrencyConverter
+import net.thauvin.erik.mobibot.modules.Dice
+import net.thauvin.erik.mobibot.modules.GoogleSearch
+import net.thauvin.erik.mobibot.modules.Joke
+import net.thauvin.erik.mobibot.modules.Lookup
+import net.thauvin.erik.mobibot.modules.Ping
+import net.thauvin.erik.mobibot.modules.RockPaperScissors
+import net.thauvin.erik.mobibot.modules.StockQuote
+import net.thauvin.erik.mobibot.modules.Twitter
+import net.thauvin.erik.mobibot.modules.War
+import net.thauvin.erik.mobibot.modules.Weather2
+import net.thauvin.erik.mobibot.modules.WorldTime
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.pinboard.PinboardPoster
+import net.thauvin.erik.semver.Version
+import org.apache.commons.cli.CommandLine
+import org.apache.commons.cli.CommandLineParser
+import org.apache.commons.cli.DefaultParser
+import org.apache.commons.cli.HelpFormatter
+import org.apache.commons.cli.Option
+import org.apache.commons.cli.Options
+import org.apache.commons.cli.ParseException
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.LogManager
+import org.apache.logging.log4j.Logger
+import org.apache.logging.log4j.core.config.Configurator
+import org.jibble.pircbot.PircBot
+import java.io.BufferedOutputStream
+import java.io.FileNotFoundException
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.PrintStream
+import java.lang.String.join
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.*
+import java.util.logging.ConsoleHandler
+import java.util.regex.Pattern
+import kotlin.system.exitProcess
+
+/**
+ * Implements the #mobitopia bot.
+ */
+@Version(properties = "version.properties", className = "ReleaseInfo", template = "ReleaseInfo.mustache", type = "kt")
+class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Properties) : PircBot() {
+    // Commands and Modules
+    private val addons = Addons()
+
+    /** Main channel. */
+    val channel: String
+
+    // IRC port
+    private val ircPort: Int
+
+    /** IRC server. */
+    val ircServer: String
+
+    /** Logger. */
+    val logger: Logger = LogManager.getLogger(Mobibot::class.java)
+
+    // Logger default level
+    private val loggerLevel: Level
+
+    /** Log directory. */
+    val logsDir: String
+
+    // Pinboard posts handler
+    private val pinboard: PinboardPoster = PinboardPoster()
+
+    /** Tell command. */
+    val tell: Tell
+
+    /** Today's date. */
+    val today = today()
+
+    /** Twitter module. */
+    val twitter: Twitter
+
+    /** The backlogs URL. */
+    var backlogsUrl = ""
+
+    // Ident message
+    private var identMsg = ""
+
+    // Ident nick
+    private var identNick = ""
+
+    // NickServ ident password
+    private var identPwd = ""
+
+    // Is pinboard enabled?
+    private var isPinboardEnabled = false
+
+    /** Timer. */
+    val timer = Timer(true)
+
+    /** Weblog URL */
+    var weblogUrl = ""
+
+    /** The current channel name. */
+    private val channelName: String
+        get() = channel.substring(1)
+
+    /** The enabled modules names. */
+    val modulesNames: List<String>
+        get() = addons.modulesNames
+
+    /**
+     * Sends an action to the current channel.
+     */
+    fun action(action: String) {
+        action(channel, action)
+    }
+
+    /**
+     * Sends an action to the channel.
+     */
+    private fun action(channel: String, action: String) {
+        if (channel.isNotBlank() && action.isNotBlank()) {
+            sendAction(channel, action)
+        }
+    }
+
+    /**
+     * Adds pin on pinboard.
+     */
+    fun addPin(entry: EntryLink) {
+        if (isPinboardEnabled) {
+            addPin(pinboard, ircServer, entry)
+        }
+    }
+
+    /**
+     * Connects to the server and joins the channel.
+     */
+    fun connect() {
+        try {
+            connect(ircServer, ircPort)
+        } catch (e: Exception) {
+            var retries = 0
+            while (retries++ < MAX_RECONNECT && !isConnected) {
+                sleep(10)
+                try {
+                    connect(ircServer, ircPort)
+                } catch (ex: Exception) {
+                    if (retries == MAX_RECONNECT) {
+                        logger.debug("Unable to reconnect to $ircServer, after $MAX_RECONNECT retries.", ex)
+                        e.printStackTrace(System.err)
+                        exitProcess(1)
+                    }
+                }
+            }
+        }
+        identify()
+        joinChannel()
+    }
+
+    /**
+     * Deletes pin on pinboard.
+     */
+    fun deletePin(index: Int, entry: EntryLink) {
+        if (isPinboardEnabled) {
+            deletePin(pinboard, entry)
+        }
+        if (twitter.isAutoPost) {
+            twitter.removeEntry(index)
+        }
+    }
+
+    /**
+     * Responds with the commands help, if any.
+     */
+    private fun helpCommands(sender: String, topic: String, isPrivate: Boolean): Boolean {
+        for (command in addons.commands) {
+            if (command.isVisible && command.name.startsWith(topic)) {
+                return command.helpResponse(topic, sender, isOp(sender), isPrivate)
+            }
+        }
+        return false
+    }
+
+    /**
+     * Responds with the default help.
+     */
+    fun helpDefault(sender: String, isOp: Boolean, isPrivate: Boolean) {
+        send(sender, "Type a URL on $channel to post it.", isPrivate)
+        send(sender, "For more information on a specific command, type:", isPrivate)
+        send(
+            sender,
+            helpIndent(helpFormat("""%c ${Constants.HELP_CMD} <command>""", nick, isPrivate)),
+            isPrivate
+        )
+        send(sender, "The commands are:", isPrivate)
+        sendList(sender, addons.names, 8, isPrivate, true)
+        if (isOp) {
+            send(sender, "The op commands are:", isPrivate)
+            sendList(sender, addons.ops, 8, isPrivate, true)
+        }
+    }
+
+    /**
+     * Responds with the modules help, if any.
+     */
+    private fun helpModules(sender: String, topic: String, isPrivate: Boolean): Boolean {
+        for (module in addons.modules) {
+            for (cmd in module.commands) {
+                if (topic == cmd) {
+                    module.helpResponse(sender, isPrivate)
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+    /**
+     * Responds with the default, commands or modules help.
+     */
+    private fun helpResponse(sender: String, topic: String, isPrivate: Boolean) {
+        val isOp = isOp(sender)
+        if (topic.isBlank()) {
+            helpDefault(sender, isOp, isPrivate)
+        } else {
+            // Command, Modules or Default
+            if (!helpCommands(sender, topic, isPrivate) && !helpModules(
+                    sender,
+                    topic.toLowerCase().trim(),
+                    isPrivate
+                )
+            ) {
+                helpDefault(sender, isOp, isPrivate)
+            }
+        }
+    }
+
+    /**
+     * Identifies the bot.
+     */
+    private fun identify() {
+        // Identify with NickServ
+        if (identPwd.isNotBlank()) {
+            identify(identPwd)
+        }
+        // Identify with a specified nick
+        if (identNick.isNotBlank() && identMsg.isNotBlank()) {
+            sendMessage(identNick, identMsg)
+        }
+    }
+
+    /**
+     * Returns {@code true} if the specified sender is an Op on the [channel][.ircChannel].
+     */
+    fun isOp(sender: String): Boolean {
+        for (user in getUsers(channel)) {
+            if (user.nick == sender) {
+                return user.isOp
+            }
+        }
+        return false
+    }
+
+    /**
+     * Joins the bot's channel.
+     */
+    private fun joinChannel() {
+        joinChannel(channel)
+        twitter.notification("$name ${ReleaseInfo.VERSION} has joined $channel")
+    }
+
+    override fun onDisconnect() {
+        if (weblogUrl.isNotBlank()) {
+            version = weblogUrl
+        }
+        sleep(5)
+        connect()
+    }
+
+    override fun onMessage(
+        channel: String,
+        sender: String,
+        login: String,
+        hostname: String,
+        message: String
+    ) {
+        logger.debug(">>> $sender: $message")
+        tell.send(sender, true)
+        if (message.matches("(?i)${Pattern.quote(nick)}:.*".toRegex())) { // mobibot: <command>
+            val cmds = message.substring(message.indexOf(':') + 1).trim().split(" ".toRegex(), 2).toTypedArray()
+            val cmd = cmds[0].toLowerCase()
+            val args = if (cmds.size > 1) {
+                cmds[1].trim()
+            } else ""
+            if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
+                helpResponse(sender, args, false)
+            } else {
+                // Commands
+                for (command in addons.commands) {
+                    if (command.isPublic && command.name.startsWith(cmd)) {
+                        command.commandResponse(sender, login, args, isOp(sender), false)
+                        return
+                    }
+                }
+                // Modules
+                for (module in addons.modules) { // modules
+                    for (c in module.commands) {
+                        if (cmd.startsWith(c)) {
+                            module.commandResponse(sender, cmd, args, false)
+                            return
+                        }
+                    }
+                }
+            }
+        } else {
+            // Commands, e.g.: https://www.example.com/
+            for (command in addons.commands) {
+                if (command.matches(message)) {
+                    command.commandResponse(sender, login, message, isOp(sender), false)
+                    return
+                }
+            }
+        }
+        storeRecap(sender, message, false)
+    }
+
+    override fun onPrivateMessage(
+        sender: String,
+        login: String,
+        hostname: String,
+        message: String
+    ) {
+        if (logger.isDebugEnabled) {
+            logger.debug(">>> $sender : $message")
+        }
+        val cmds = message.split(" ".toRegex(), 2).toTypedArray()
+        val cmd = cmds[0].toLowerCase()
+        val args = if (cmds.size > 1) {
+            cmds[1].trim()
+        } else ""
+        val isOp = isOp(sender)
+        if (cmd.startsWith(Constants.HELP_CMD)) { // help
+            helpResponse(sender, args, true)
+        } else if (isOp && "kill" == cmd) { // kill
+            twitter.notification("$name killed by $sender on $channel")
+            sendRawLine("QUIT : Poof!")
+            exitProcess(0)
+        } else if (isOp && Constants.DEBUG_CMD == cmd) { // debug
+            if (logger.isDebugEnabled) {
+                Configurator.setLevel(logger.name, loggerLevel)
+            } else {
+                Configurator.setLevel(logger.name, Level.DEBUG)
+            }
+            send(sender, "Debug logging is " + if (logger.isDebugEnabled) "enabled." else "disabled.", true)
+        } else if (isOp && Constants.DIE_CMD == cmd) { // die
+            send("$sender has just signed my death sentence.")
+            timer.cancel()
+            twitter.shutdown()
+            twitter.notification("$name stopped by $sender on $channel")
+            sleep(3)
+            quitServer("The Bot Is Out There!")
+            exitProcess(0)
+        } else {
+            for (command in addons.commands) {
+                if (command.name.startsWith(cmd)) {
+                    command.commandResponse(sender, login, args, isOp, true)
+                    return
+                }
+            }
+            for (module in addons.modules) {
+                if (module.isPrivateMsgEnabled) {
+                    for (c in module.commands) {
+                        if (cmd == c) {
+                            module.commandResponse(sender, cmd, args, true)
+                            return
+                        }
+                    }
+                }
+            }
+            helpDefault(sender, isOp, true)
+        }
+    }
+
+    override fun onAction(sender: String, login: String, hostname: String, target: String, action: String) {
+        if (channel == target) {
+            storeRecap(sender, action, true)
+        }
+    }
+
+    override fun onJoin(channel: String, sender: String, login: String, hostname: String) {
+        tell.send(sender)
+    }
+
+    override fun onNickChange(oldNick: String, login: String, hostname: String, newNick: String) {
+        tell.send(newNick)
+    }
+
+    /**
+     * Sends a private message or notice.
+     */
+    fun send(sender: String, message: String?, isPrivate: Boolean) {
+        if (message != null && sender.isNotBlank()) {
+            if (isPrivate) {
+                logger.debug("Sending message to $sender : $message")
+                sendMessage(sender, message)
+            } else {
+                logger.debug("Sending notice to $sender: $message")
+                sendNotice(sender, message)
+            }
+        }
+    }
+
+    /**
+     * Sends a notice to the channel.
+     */
+    fun send(notice: String?) {
+        if (notice != null) send(channel, notice, false)
+    }
+
+    /**
+     * Sends a message.
+     */
+    fun send(who: String, message: Message) {
+        send(if (message.isNotice) who else channel, message.msg, message.color, message.isPrivate)
+    }
+
+    /**
+     * Sends a message.
+     */
+    fun send(who: String, message: String, color: String, isPrivate: Boolean) {
+        send(who, colorize(message, color), isPrivate)
+    }
+
+    /**
+     * Send a formatted commands/modules, etc. list.
+     */
+    fun sendList(
+        nick: String,
+        list: List<String>,
+        size: Int,
+        isPrivate: Boolean,
+        isBold: Boolean
+    ) {
+        var i = 0
+        while (i < list.size) {
+            send(
+                nick,
+                helpIndent(join(" ", list.subList(i, list.size.coerceAtMost(i + size))), isBold),
+                isPrivate
+            )
+            i += size
+        }
+    }
+
+    /**
+     * Sets the bot's identification.
+     */
+    private fun setIdentity(pwd: String, nick: String, msg: String) {
+        identPwd = pwd
+        identNick = nick
+        identMsg = msg
+    }
+
+    /**
+     * Sets the pinboard authentication.
+     */
+    private fun setPinboardAuth(apiToken: String) {
+        if (apiToken.isNotBlank()) {
+            pinboard.apiToken = apiToken
+            isPinboardEnabled = true
+            if (logger.isDebugEnabled) {
+                val consoleHandler = ConsoleHandler()
+                consoleHandler.level = java.util.logging.Level.FINE
+                pinboard.logger.addHandler(consoleHandler)
+                pinboard.logger.level = java.util.logging.Level.FINE
+            }
+        }
+    }
+
+    /**
+     * Sleeps for the specified number of seconds.
+     */
+    fun sleep(secs: Int) {
+        try {
+            Thread.sleep(secs * 1000L)
+        } catch (ignore: InterruptedException) {
+            // Do nothing
+        }
+    }
+
+    /**
+     * Updates pin on pinboard.
+     */
+    fun updatePin(oldUrl: String, entry: EntryLink) {
+        if (isPinboardEnabled) {
+            updatePin(pinboard, ircServer, oldUrl, entry)
+        }
+    }
+
+    companion object {
+        // Maximum number of times the bot will try to reconnect, if disconnected
+        private const val MAX_RECONNECT = 10
+
+        /**
+         * The Truth is Out There!
+         */
+        @JvmStatic
+        fun main(args: Array<String>) {
+            // Setup the command line options
+            val options = Options()
+                .addOption(
+                    Constants.HELP_ARG.substring(0, 1),
+                    Constants.HELP_ARG,
+                    false,
+                    "print this help message"
+                )
+                .addOption(
+                    Constants.DEBUG_ARG.substring(0, 1), Constants.DEBUG_ARG, false,
+                    "print debug & logging data directly to the console"
+                )
+                .addOption(
+                    Option.builder(Constants.PROPS_ARG.substring(0, 1)).hasArg()
+                        .argName("file")
+                        .desc("use " + "alternate properties file")
+                        .longOpt(Constants.PROPS_ARG).build()
+                )
+                .addOption(
+                    Constants.VERSION_ARG.substring(0, 1),
+                    Constants.VERSION_ARG,
+                    false,
+                    "print version info"
+                )
+
+            // Parse the command line
+            val parser: CommandLineParser = DefaultParser()
+            val commandLine: CommandLine
+            try {
+                commandLine = parser.parse(options, args)
+            } catch (e: ParseException) {
+                System.err.println("CLI Parsing failed.  Reason: ${e.message}")
+                e.printStackTrace(System.err)
+                exitProcess(1)
+            }
+            when {
+                commandLine.hasOption(Constants.HELP_ARG[0]) -> {
+                    // Output the usage
+                    HelpFormatter().printHelp(Mobibot::class.java.name, options)
+                }
+                commandLine.hasOption(Constants.VERSION_ARG[0]) -> {
+                    println("${ReleaseInfo.PROJECT} ${ReleaseInfo.VERSION} (${isoLocalDate(ReleaseInfo.BUILDDATE)})")
+                    println(ReleaseInfo.WEBSITE)
+                }
+                else -> {
+                    val p = Properties()
+                    try {
+                        Files.newInputStream(
+                            Paths.get(commandLine.getOptionValue(Constants.PROPS_ARG[0], "./mobibot.properties"))
+                        ).use { fis ->
+                            // Load the properties files
+                            p.load(fis)
+                        }
+                    } catch (e: FileNotFoundException) {
+                        System.err.println("Unable to find properties file.")
+                        e.printStackTrace(System.err)
+                        exitProcess(1)
+                    } catch (e: IOException) {
+                        System.err.println("Unable to open properties file.")
+                        e.printStackTrace(System.err)
+                        exitProcess(1)
+                    }
+                    val nickname = p.getProperty("nick", Mobibot::class.java.name.toLowerCase())
+                    val channel = p.getProperty("channel")
+                    val logsDir = ensureDir(p.getProperty("logs", "."), false)
+
+                    // Redirect the stdout and stderr
+                    if (!commandLine.hasOption(Constants.DEBUG_ARG[0])) {
+                        try {
+                            val stdout = PrintStream(
+                                BufferedOutputStream(
+                                    FileOutputStream(
+                                        logsDir + channel.substring(1) + '.' + today() + ".log", true
+                                    )
+                                ), true
+                            )
+                            System.setOut(stdout)
+                        } catch (e: IOException) {
+                            System.err.println("Unable to open output (stdout) log file.")
+                            e.printStackTrace(System.err)
+                            exitProcess(1)
+                        }
+                        try {
+                            val stderr = PrintStream(
+                                BufferedOutputStream(
+                                    FileOutputStream("$logsDir$nickname.err", true)
+                                ), true
+                            )
+                            System.setErr(stderr)
+                        } catch (e: IOException) {
+                            System.err.println("Unable to open error (stderr) log file.")
+                            e.printStackTrace(System.err)
+                            exitProcess(1)
+                        }
+                    }
+
+                    // Create the bot
+                    val bot = Mobibot(nickname, channel, logsDir, p)
+
+                    // Connect
+                    bot.connect()
+                }
+            }
+        }
+    }
+
+    /**
+     * Initialize the bot.
+     */
+    init {
+        System.getProperties().setProperty(
+            "sun.net.client.defaultConnectTimeout",
+            java.lang.String.valueOf(Constants.CONNECT_TIMEOUT)
+        )
+        System.getProperties().setProperty(
+            "sun.net.client.defaultReadTimeout",
+            java.lang.String.valueOf(Constants.CONNECT_TIMEOUT)
+        )
+        name = nickname
+        ircServer = p.getProperty("server", Constants.DEFAULT_SERVER)
+        ircPort = getIntProperty(p.getProperty("port"), Constants.DEFAULT_PORT)
+        this.channel = channel
+        logsDir = logsDirPath
+
+        // Set the logger level
+        loggerLevel = logger.level
+
+        // Load the current entries and backlogs, if any
+        try {
+            startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, this.channel)
+            logger.debug("Last feed: $startDate")
+        } catch (e: Exception) {
+            logger.error("An error occurred while loading the logs.", e)
+        }
+
+        // Initialize the bot
+        setVerbose(true)
+        setAutoNickChange(true)
+        login = p.getProperty("login", name)
+        version = ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION
+        // setMessageDelay(1000);
+        setIdentity(p.getProperty("ident", ""), p.getProperty("ident-nick", ""), p.getProperty("ident-msg", ""))
+
+        // Set the URLs
+        weblogUrl = p.getProperty("weblog", "")
+        backlogsUrl = ensureDir(p.getProperty("backlogs", weblogUrl), true)
+
+        // Set the pinboard authentication
+        setPinboardAuth(p.getProperty("pinboard-api-token"))
+
+        // Load the commands
+        addons.add(AddLog(this), p)
+        addons.add(ChannelFeed(this, channelName), p)
+        addons.add(Cycle(this), p)
+        addons.add(Ignore(this), p)
+        addons.add(Info(this), p)
+        addons.add(Me(this), p)
+        addons.add(Modules(this), p)
+        addons.add(Msg(this), p)
+        addons.add(Nick(this), p)
+        addons.add(Recap(this), p)
+        addons.add(Say(this), p)
+        addons.add(Users(this), p)
+        addons.add(Versions(this), p)
+
+        // Tell command
+        tell = Tell(this)
+        addons.add(tell, p)
+
+        // Load the links commands
+        addons.add(Comment(this), p)
+        addons.add(Posting(this), p)
+        addons.add(Tags(this), p)
+        addons.add(LinksMgr(this), p)
+        addons.add(View(this), p)
+
+        // Load the modules
+        addons.add(Calc(this), p)
+        addons.add(CurrencyConverter(this), p)
+        addons.add(Dice(this), p)
+        addons.add(GoogleSearch(this), p)
+        addons.add(Joke(this), p)
+        addons.add(Lookup(this), p)
+        addons.add(Ping(this), p)
+        addons.add(RockPaperScissors(this), p)
+        addons.add(StockQuote(this), p)
+        addons.add(War(this), p)
+        addons.add(Weather2(this), p)
+        addons.add(WorldTime(this), p)
+
+        // Twitter module
+        twitter = Twitter(this)
+        addons.add(twitter, p)
+
+        // Sort the addons
+        addons.sort()
+
+        // Save the entries
+        saveEntries(this, true)
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index fcdc20e..474108f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -134,7 +134,7 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun removeEntry(sender: String, login: String, isOp: Boolean, index: Int) {
-        val entry: EntryLink = LinksMgr.entries[index]
+        val entry: EntryLink = entries[index]
         if (entry.login == login || isOp) {
             bot.deletePin(index, entry)
             entries.removeAt(index)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index 0b485eb..280d9aa 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -41,7 +41,6 @@ import net.thauvin.erik.mobibot.Utils.Companion.reverseColor
 import net.thauvin.erik.mobibot.Utils.Companion.utcDateTime
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.View
-import org.apache.commons.lang3.StringUtils
 import java.util.concurrent.CopyOnWriteArrayList
 
 /**
@@ -143,7 +142,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
         isPrivate: Boolean
     ) {
         if (isEnabled()) {
-            if (StringUtils.isBlank(args)) {
+            if (args.isBlank()) {
                 helpResponse(args, sender, isOp, isPrivate)
             } else if (args.startsWith(View.VIEW_CMD)) {
                 if (bot.isOp(sender) && "${View.VIEW_CMD} $TELL_ALL_KEYWORD" == args) {
@@ -178,12 +177,13 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
     // New message.
     private fun newMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean) {
         val split = args.split(" ".toRegex(), 2).toTypedArray()
-        if (split.size == 2 && StringUtils.isNotBlank(split[1]) && split[1].contains(" ")) {
+        if (split.size == 2 && split[1].isNotBlank() && split[1].contains(" ")) {
             if (messages.size < maxSize) {
                 val message = TellMessage(sender, split[0], split[1].trim())
                 messages.add(message)
                 save()
-                bot.send(sender, "Message [ID ${message.id}] was queued for ${bold(message.recipient)}", isPrivate
+                bot.send(
+                    sender, "Message [ID ${message.id}] was queued for ${bold(message.recipient)}", isPrivate
                 )
             } else {
                 bot.send(sender, "Sorry, the messages queue is currently full.", isPrivate)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
index 4dd3f40..09dc5da 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
@@ -74,12 +74,12 @@ class TellMessage internal constructor(
      * Returns {@code true) if the message was received.
      */
     var isReceived = false
-       set(value) {
-           if (value) {
-               receptionDate = LocalDateTime.now(Clock.systemUTC())
-           }
-           field = value
-       }
+        set(value) {
+            if (value) {
+                receptionDate = LocalDateTime.now(Clock.systemUTC())
+            }
+            field = value
+        }
 
     /**
      * Return the message creating date.
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
index 44f487d..3f8710a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -32,18 +32,17 @@
 package net.thauvin.erik.mobibot.commands.tell
 
 import org.apache.logging.log4j.Logger
-import java.time.LocalDateTime
-import java.io.ObjectInputStream
 import java.io.BufferedInputStream
+import java.io.BufferedOutputStream
 import java.io.FileNotFoundException
 import java.io.IOException
-import java.lang.ClassNotFoundException
-import java.io.BufferedOutputStream
+import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.time.Clock
-import java.util.ArrayList
+import java.time.LocalDateTime
+import java.util.*
 
 /**
  * The Tell Messages Manager.
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index a526542..f8e9a43 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -41,7 +41,6 @@ import com.rometools.rome.io.SyndFeedInput
 import com.rometools.rome.io.SyndFeedOutput
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.Companion.isoLocalDate
-import org.apache.commons.lang3.StringUtils
 import java.io.IOException
 import java.io.InputStreamReader
 import java.io.OutputStreamWriter
@@ -143,7 +142,7 @@ class EntriesMgr private constructor() {
             if (bot.logger.isDebugEnabled) {
                 bot.logger.debug("Saving the feeds...")
             }
-            if (StringUtils.isNotBlank(bot.logsDir) && StringUtils.isNotBlank(bot.weblogUrl)) {
+            if (bot.logsDir.isNotBlank() && bot.weblogUrl.isNotBlank()) {
                 try {
                     val output = SyndFeedOutput()
                     var rss: SyndFeed = SyndFeedImpl()
@@ -208,7 +207,7 @@ class EntriesMgr private constructor() {
                         ), StandardCharsets.UTF_8
                     ).use { fw -> output.output(rss, fw) }
                     if (isDayBackup) {
-                        if (StringUtils.isNotBlank(bot.backlogsUrl)) {
+                        if (bot.backlogsUrl.isNotBlank()) {
                             if (!history.contains(bot.today)) {
                                 history.add(bot.today)
                                 while (history.size > MAX_BACKLOGS) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
index 9601d17..c041249 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -53,7 +53,7 @@ class EntryLink : Serializable {
     var channel: String
 
     // Creation date
-    var date = Calendar.getInstance().time
+    var date: Date = Calendar.getInstance().time
 
     // Link's URL
     var link: String
@@ -178,12 +178,12 @@ class EntryLink : Serializable {
     /**
      * Sets the tags.
      */
-    fun setTags(tags: List<String?>) {
-        if (!tags.isEmpty()) {
+    private fun setTags(tags: List<String?>) {
+        if (tags.isNotEmpty()) {
             var category: SyndCategoryImpl
             for (tag in tags) {
-                if (StringUtils.isNoneBlank(tag)) {
-                    val t = StringUtils.lowerCase(tag)
+                if (!tag.isNullOrBlank()) {
+                    val t = tag.toLowerCase()
                     val mod = t[0]
                     if (mod == '-') {
                         // Don't remove the channel tag
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index dd40a8c..f4f36a7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -33,7 +33,6 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
-import org.apache.commons.lang3.StringUtils
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 
@@ -113,7 +112,7 @@ abstract class AbstractModule(val bot: Mobibot) {
     open val isValidProperties: Boolean
         get() {
             for (s in propertyKeys) {
-                if (StringUtils.isBlank(properties[s])) {
+                if (properties[s].isNullOrBlank()) {
                     return false
                 }
             }
@@ -124,7 +123,7 @@ abstract class AbstractModule(val bot: Mobibot) {
      * Sets a property key and value.
      */
     fun setProperty(key: String, value: String) {
-        if (StringUtils.isNotBlank(key)) {
+        if (key.isNotBlank()) {
             properties[key] = value
         }
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
index 22a6c7e..b1ea6a2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -34,7 +34,6 @@ package net.thauvin.erik.mobibot.modules
 import net.objecthunter.exp4j.ExpressionBuilder
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
-import org.apache.commons.lang3.StringUtils
 import java.text.DecimalFormat
 
 /**
@@ -47,7 +46,7 @@ class Calc(bot: Mobibot) : AbstractModule(bot) {
         args: String,
         isPrivate: Boolean
     ) {
-        if (StringUtils.isNotBlank(args)) {
+        if (args.isNotBlank()) {
             bot.send(calc(args))
         } else {
             helpResponse(sender, isPrivate)
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index c72e73d..487981c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -157,8 +157,8 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 if (cmds[3] == cmds[1] || "0" == cmds[0]) {
                     PublicMessage("You're kidding, right?")
                 } else {
-                    val to = StringUtils.upperCase(cmds[1])
-                    val from = StringUtils.upperCase(cmds[3])
+                    val to = cmds[1].toUpperCase()
+                    val from = cmds[3].toUpperCase()
                     if (EXCHANGE_RATES.containsKey(to) && EXCHANGE_RATES.containsKey(from)) {
                         try {
                             val amt = cmds[0].replace(",", "").toDouble()
@@ -166,10 +166,10 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                             val doubleTo = EXCHANGE_RATES[from]!!.toDouble()
                             PublicMessage(
                                 NumberFormat.getCurrencyInstance(Constants.LOCALE).format(amt).substring(1)
-                                    + " ${StringUtils.upperCase(cmds[1])} = "
+                                    + " ${cmds[1].toUpperCase()} = "
                                     + NumberFormat.getCurrencyInstance(Constants.LOCALE)
                                     .format(amt * doubleTo / doubleFrom).substring(1)
-                                    + " ${StringUtils.upperCase(cmds[3])}"
+                                    + " ${cmds[3].toUpperCase()}"
                             )
                         } catch (e: NumberFormatException) {
                             ErrorMessage("Let's try with some real numbers next time, okay?")
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index 891a6f2..b9c78d0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -52,7 +52,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
         with(bot) {
-            if (StringUtils.isNotBlank(args)) {
+            if (args.isNotBlank()) {
                 try {
                     val results = searchGoogle(
                         args, properties[GOOGLE_API_KEY_PROP],
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
index 722ab75..26383e2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -56,11 +56,13 @@ class Joke(bot: Mobibot) : ThreadedModule(bot) {
     /**
      * Returns a random joke from [The Internet Chuck Norris Database](http://www.icndb.com/).
      */
-    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) = try {
-        bot.send(Utils.cyan(randomJoke().msg))
-    } catch (e: ModuleException) {
-        bot.logger.warn(e.debugMessage, e)
-        bot.send(sender, e.message, isPrivate)
+    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+        try {
+            bot.send(Utils.cyan(randomJoke().msg))
+        } catch (e: ModuleException) {
+            bot.logger.warn(e.debugMessage, e)
+            bot.send(sender, e.message, isPrivate)
+        }
     }
 
     companion object {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 434ca54..702077a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -37,7 +37,6 @@ import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
 import net.thauvin.erik.mobibot.msg.PublicMessage
-import org.apache.commons.lang3.StringUtils
 import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
@@ -53,7 +52,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
         with(bot) {
-            if (StringUtils.isNotBlank(args)) {
+            if (args.isNotBlank()) {
                 try {
                     val messages = getQuote(args, properties[ALPHAVANTAGE_API_KEY_PROP])
                     for (msg in messages) {
@@ -88,7 +87,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
 
         @Throws(ModuleException::class)
         private fun getJsonResponse(response: String, debugMessage: String): JSONObject {
-            return if (StringUtils.isNotBlank(response)) {
+            return if (response.isNotBlank()) {
                 val json = JSONObject(response)
                 try {
                     val info = json.getString("Information")
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
index 392cf85..ef648c8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -39,7 +39,6 @@ import net.thauvin.erik.mobibot.commands.links.LinksMgr
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
-import org.apache.commons.lang3.StringUtils
 import twitter4j.TwitterException
 import twitter4j.TwitterFactory
 import twitter4j.conf.ConfigurationBuilder
@@ -88,7 +87,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
      */
     fun notification(msg: String) {
         with(bot) {
-            if (isEnabled && StringUtils.isNotBlank(handle)) {
+            if (isEnabled && !handle.isNullOrBlank()) {
                 Thread {
                     try {
                         post(message = msg, isDm = true)
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index 9fc9847..023a4d9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -41,7 +41,6 @@ import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
 import net.thauvin.erik.mobibot.msg.PublicMessage
-import org.apache.commons.lang3.StringUtils
 import org.jibble.pircbot.Colors
 import java.util.*
 import kotlin.math.roundToInt
@@ -54,7 +53,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
      * Fetches the weather data from a specific city.
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        if (StringUtils.isNotBlank(args)) {
+        if (args.isNotBlank()) {
             try {
                 val messages = getWeather(args, properties[OWM_API_KEY_PROP])
                 if (messages[0].isError) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index cafe903..835fcca 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -190,7 +190,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         with(bot) {
             if (args.isEmpty()) {
                 send(sender, "The supported countries/zones are: ", isPrivate)
-                sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, false, false)
+                sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, isPrivate = false, isBold = false)
             } else {
                 val msg = worldTime(args)
                 if (isPrivate) {
diff --git a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index 5dbf7f3..75a1139 100644
--- a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -31,11 +31,11 @@
  */
 package net.thauvin.erik.mobibot.commands.tell
 
-import java.time.temporal.Temporal
-import java.time.LocalDateTime
 import org.assertj.core.api.Assertions
 import org.testng.annotations.Test
 import java.time.Duration
+import java.time.LocalDateTime
+import java.time.temporal.Temporal
 
 /**
  * The `TellMessageTest` class.
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index 019538f..8592447 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -62,7 +62,7 @@ class GoogleSearchTest : LocalProperties() {
                 .`as`("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
-            if ("true" == System.getenv("CI") && !apiKey.isNullOrBlank() && !cseKey.isNullOrBlank()) {
+            if ("true" == System.getenv("CI") && !apiKey.isBlank() && !cseKey.isBlank()) {
                 throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey, cseKey))
             } else {
                 throw e
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index ea78c34..c47509b 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -63,7 +63,7 @@ class StockQuoteTest : LocalProperties() {
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
-            if ("true" == System.getenv("CI") && !apiKey.isNullOrBlank()) {
+            if ("true" == System.getenv("CI") && !apiKey.isBlank()) {
                 throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey))
             } else {
                 throw e
diff --git a/version.properties b/version.properties
index 25393d2..0f713d3 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Dec 04 15:43:01 PST 2020
-version.buildmeta=312
+#Fri Dec 04 22:59:43 PST 2020
+version.buildmeta=337
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+312
+version.semver=0.8.0-beta+337

From 5a669601da3257af752b784c0ed91477eaad28e3 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 4 Dec 2020 23:39:58 -0800
Subject: [PATCH 099/262] Replace java string functions with kotlin's.

---
 src/main/java/net/thauvin/erik/mobibot/Mobibot.kt | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index a93f2ae..0b633fa 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -99,7 +99,6 @@ import java.io.FileNotFoundException
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.PrintStream
-import java.lang.String.join
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.*
@@ -512,7 +511,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         while (i < list.size) {
             send(
                 nick,
-                helpIndent(join(" ", list.subList(i, list.size.coerceAtMost(i + size))), isBold),
+                helpIndent(list.subList(i, list.size.coerceAtMost(i + size)).joinToString(" ", truncated = ""), isBold),
                 isPrivate
             )
             i += size
@@ -588,7 +587,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                 .addOption(
                     Option.builder(Constants.PROPS_ARG.substring(0, 1)).hasArg()
                         .argName("file")
-                        .desc("use " + "alternate properties file")
+                        .desc("use alternate properties file")
                         .longOpt(Constants.PROPS_ARG).build()
                 )
                 .addOption(
@@ -683,14 +682,8 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      * Initialize the bot.
      */
     init {
-        System.getProperties().setProperty(
-            "sun.net.client.defaultConnectTimeout",
-            java.lang.String.valueOf(Constants.CONNECT_TIMEOUT)
-        )
-        System.getProperties().setProperty(
-            "sun.net.client.defaultReadTimeout",
-            java.lang.String.valueOf(Constants.CONNECT_TIMEOUT)
-        )
+        System.getProperties().setProperty("sun.net.client.defaultConnectTimeout", Constants.CONNECT_TIMEOUT.toString())
+        System.getProperties().setProperty("sun.net.client.defaultReadTimeout", Constants.CONNECT_TIMEOUT.toString())
         name = nickname
         ircServer = p.getProperty("server", Constants.DEFAULT_SERVER)
         ircPort = getIntProperty(p.getProperty("port"), Constants.DEFAULT_PORT)

From ece6ae98a0a082d83ebf7a021219a6648ef5f6c1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 5 Dec 2020 14:45:43 -0800
Subject: [PATCH 100/262] Converted ArrayList to List (tokenizer, etc.)
 whenever possible.

---
 .../java/net/thauvin/erik/mobibot/Mobibot.kt  | 32 +++++++++----------
 .../erik/mobibot/commands/tell/Tell.kt        |  4 +--
 .../thauvin/erik/mobibot/entries/EntryLink.kt |  2 +-
 .../erik/mobibot/modules/CurrencyConverter.kt |  2 +-
 .../thauvin/erik/mobibot/modules/Lookup.kt    | 14 +++-----
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  2 +-
 .../erik/mobibot/modules/LookupTest.kt        |  2 +-
 7 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index 0b633fa..6d37136 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -255,7 +255,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         send(sender, "For more information on a specific command, type:", isPrivate)
         send(
             sender,
-            helpIndent(helpFormat("""%c ${Constants.HELP_CMD} <command>""", nick, isPrivate)),
+            helpIndent(helpFormat("%c ${Constants.HELP_CMD} <command>", nick, isPrivate)),
             isPrivate
         )
         send(sender, "The commands are:", isPrivate)
@@ -353,7 +353,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         logger.debug(">>> $sender: $message")
         tell.send(sender, true)
         if (message.matches("(?i)${Pattern.quote(nick)}:.*".toRegex())) { // mobibot: <command>
-            val cmds = message.substring(message.indexOf(':') + 1).trim().split(" ".toRegex(), 2).toTypedArray()
+            val cmds = message.substring(message.indexOf(':') + 1).trim().split(" ".toRegex(), 2)
             val cmd = cmds[0].toLowerCase()
             val args = if (cmds.size > 1) {
                 cmds[1].trim()
@@ -399,7 +399,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         if (logger.isDebugEnabled) {
             logger.debug(">>> $sender : $message")
         }
-        val cmds = message.split(" ".toRegex(), 2).toTypedArray()
+        val cmds = message.split(" ".toRegex(), 2)
         val cmd = cmds[0].toLowerCase()
         val args = if (cmds.size > 1) {
             cmds[1].trim()
@@ -503,7 +503,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     fun sendList(
         nick: String,
         list: List<String>,
-        size: Int,
+        maxPerLine: Int,
         isPrivate: Boolean,
         isBold: Boolean
     ) {
@@ -511,22 +511,16 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         while (i < list.size) {
             send(
                 nick,
-                helpIndent(list.subList(i, list.size.coerceAtMost(i + size)).joinToString(" ", truncated = ""), isBold),
+                helpIndent(
+                    list.subList(i, list.size.coerceAtMost(i + maxPerLine)).joinToString(" ", truncated = ""),
+                    isBold
+                ),
                 isPrivate
             )
-            i += size
+            i += maxPerLine
         }
     }
 
-    /**
-     * Sets the bot's identification.
-     */
-    private fun setIdentity(pwd: String, nick: String, msg: String) {
-        identPwd = pwd
-        identNick = nick
-        identMsg = msg
-    }
-
     /**
      * Sets the pinboard authentication.
      */
@@ -690,7 +684,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         this.channel = channel
         logsDir = logsDirPath
 
-        // Set the logger level
+        // Set the default logger level
         loggerLevel = logger.level
 
         // Load the current entries and backlogs, if any
@@ -707,7 +701,11 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         login = p.getProperty("login", name)
         version = ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION
         // setMessageDelay(1000);
-        setIdentity(p.getProperty("ident", ""), p.getProperty("ident-nick", ""), p.getProperty("ident-msg", ""))
+
+        // Set NICKSERV identification
+        identPwd = p.getProperty("ident", "")
+        identNick = p.getProperty("ident-nick", "")
+        identMsg = p.getProperty("ident-msg", "")
 
         // Set the URLs
         weblogUrl = p.getProperty("weblog", "")
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index 280d9aa..c0e97d0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -71,7 +71,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
 
     // Delete message.
     private fun deleteMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean) {
-        val split = args.split(" ").toTypedArray()
+        val split = args.split(" ")
         if (split.size == 2) {
             val id = split[1]
             var deleted = false
@@ -176,7 +176,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
 
     // New message.
     private fun newMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean) {
-        val split = args.split(" ".toRegex(), 2).toTypedArray()
+        val split = args.split(" ".toRegex(), 2)
         if (split.size == 2 && split[1].isNotBlank() && split[1].contains(" ")) {
             if (messages.size < maxSize) {
                 val message = TellMessage(sender, split[0], split[1].trim())
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
index c041249..5d6eea2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -172,7 +172,7 @@ class EntryLink : Serializable {
      * Sets the tags.
      */
     fun setTags(tags: String) {
-        setTags(tags.split(LinksMgr.TAG_MATCH).toTypedArray().toList())
+        setTags(tags.split(LinksMgr.TAG_MATCH))
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 487981c..f15c184 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -152,7 +152,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
          */
         @JvmStatic
         fun convertCurrency(query: String): Message {
-            val cmds = query.split(" ").toTypedArray()
+            val cmds = query.split(" ")
             return if (cmds.size == 4) {
                 if (cmds[3] == cmds[1] || "0" == cmds[0]) {
                     PublicMessage("You're kidding, right?")
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
index c46baf0..91954b6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -126,13 +126,9 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
 
         /**
          * Performs a whois IP query.
-         *
-         * @param query The IP address.
-         * @return The IP whois data, if any.
-         * @throws java.io.IOException If a connection error occurs.
          */
         @Throws(IOException::class)
-        private fun whois(query: String): Array<String> {
+        private fun whois(query: String): List<String> {
             return whois(query, WHOIS_HOST)
         }
 
@@ -141,9 +137,9 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
          */
         @JvmStatic
         @Throws(IOException::class)
-        fun whois(query: String, host: String): Array<String> {
+        fun whois(query: String, host: String): List<String> {
             val whoisClient = WhoisClient()
-            val lines: Array<String>
+            val lines: List<String>
             with(whoisClient) {
                 try {
                     defaultTimeout = Constants.CONNECT_TIMEOUT
@@ -151,9 +147,9 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
                     soTimeout = Constants.CONNECT_TIMEOUT
                     setSoLinger(false, 0)
                     lines = if (WHOIS_HOST == host) {
-                        query("n - $query").split("\n").toTypedArray()
+                        query("n - $query").split("\n")
                     } else {
-                        query(query).split("\n").toTypedArray()
+                        query(query).split("\n")
                     }
                 } finally {
                     disconnect()
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index 023a4d9..5595519 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -107,7 +107,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
             val messages = ArrayList<Message>()
             owm.unit = OWM.Unit.IMPERIAL
             if (query.isNotBlank()) {
-                val argv = query.split(",").toTypedArray()
+                val argv = query.split(",")
                 if (argv.size in 1..2) {
                     val city = argv[0].trim()
                     val country: String = if (argv.size > 1 && argv[1].isNotBlank()) {
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
index 303a377..aad40e5 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -52,7 +52,7 @@ class LookupTest {
     @Throws(Exception::class)
     fun testWhois() {
         val result = whois("17.178.96.59", Lookup.WHOIS_HOST)
-        Assertions.assertThat(Arrays.stream(result).anyMatch { m: String -> m.contains("Apple Inc.") })
+        Assertions.assertThat(result.stream().anyMatch { m: String -> m.contains("Apple Inc.") })
             .`as`("whois(17.178.96.59/Apple Inc.").isTrue
     }
 }

From 5a831f2c7c6418eb83d0b8fed3a66dff29ed2b5a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 6 Dec 2020 01:49:02 -0800
Subject: [PATCH 101/262] Switched to MutableList vs ArrayList whenever
 possible. Made sure logging level is enabled before logging.

---
 config/detekt/baseline.xml                    |  4 +-
 .../java/net/thauvin/erik/mobibot/Addons.kt   | 11 +++---
 .../net/thauvin/erik/mobibot/FeedReader.kt    |  4 +-
 .../java/net/thauvin/erik/mobibot/Mobibot.kt  | 38 +++++++++----------
 .../thauvin/erik/mobibot/commands/Recap.kt    |  3 +-
 .../thauvin/erik/mobibot/commands/Users.kt    |  3 +-
 .../erik/mobibot/commands/links/LinksMgr.kt   | 10 ++---
 .../erik/mobibot/commands/tell/Tell.kt        |  7 +---
 .../mobibot/commands/tell/TellMessagesMgr.kt  | 10 ++---
 .../erik/mobibot/entries/EntriesMgr.kt        | 27 ++++++-------
 .../thauvin/erik/mobibot/entries/EntryLink.kt |  5 +--
 .../erik/mobibot/modules/AbstractModule.kt    |  8 ++--
 .../erik/mobibot/modules/CurrencyConverter.kt |  9 ++---
 .../erik/mobibot/modules/GoogleSearch.kt      |  5 +--
 .../net/thauvin/erik/mobibot/modules/Joke.kt  |  2 +-
 .../thauvin/erik/mobibot/modules/Lookup.kt    |  4 +-
 .../erik/mobibot/modules/StockQuote.kt        |  5 +--
 .../thauvin/erik/mobibot/modules/Twitter.kt   | 10 ++---
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  5 +--
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  3 +-
 20 files changed, 75 insertions(+), 98 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 46ddfa2..7d60806 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -18,7 +18,6 @@
     <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$11</ID>
     <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$3</ID>
     <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$3</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$33</ID>
     <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$4</ID>
     <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$8</ID>
     <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
@@ -54,8 +53,9 @@
     <ID>MemberNameEqualsClassName:WorldTime.kt$WorldTime.Companion$ @JvmStatic fun worldTime(query: String): Message</ID>
     <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 helpResponse(sender: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
-    <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ @Throws(IOException::class, FeedException::class) fun loadEntries(file: String, channel: String, entries: ArrayList&lt;EntryLink&gt;): String</ID>
+    <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ @Throws(IOException::class, FeedException::class) fun loadEntries(file: String, channel: String, entries: MutableList&lt;EntryLink&gt;): String</ID>
     <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
     <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ private fun setTags(tags: List&lt;String?&gt;)</ID>
     <ID>NestedBlockDepth:FeedReader.kt$FeedReader$ override fun run()</ID>
diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
index 64b7487..1974aa4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
@@ -34,17 +34,16 @@ package net.thauvin.erik.mobibot
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.modules.AbstractModule
 import java.util.*
-import kotlin.collections.ArrayList
 
 /**
  * Modules and Commands addons.
  */
 class Addons {
-    val commands: MutableList<AbstractCommand> = ArrayList()
-    val modules: MutableList<AbstractModule> = ArrayList()
-    val modulesNames: MutableList<String> = ArrayList()
-    val names: MutableList<String> = ArrayList()
-    val ops: MutableList<String> = ArrayList()
+    val commands: MutableList<AbstractCommand> = mutableListOf()
+    val modules: MutableList<AbstractModule> = mutableListOf()
+    val modulesNames: MutableList<String> = mutableListOf()
+    val names: MutableList<String> = mutableListOf()
+    val ops: MutableList<String> = mutableListOf()
 
     /**
      * Add a module with properties.
diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
index 0dcdbac..a3f6247 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
@@ -69,10 +69,10 @@ class FeedReader(
                     }
                 }
             } catch (e: MalformedURLException) {
-                logger.debug("Invalid feed URL.", e)
+                if (logger.isDebugEnabled) logger.debug("Invalid feed URL.", e)
                 send(sender, "The feed URL is invalid.", false)
             } catch (e: Exception) {
-                logger.debug("Unable to fetch the feed.", e)
+                if (logger.isDebugEnabled) logger.debug("Unable to fetch the feed.", e)
                 send(sender, "An error has occurred while fetching the feed: ${e.message}", false)
             }
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index 6d37136..dcdd5a2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -136,25 +136,25 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     private val pinboard: PinboardPoster = PinboardPoster()
 
     /** Tell command. */
-    val tell: Tell
+    val tell: Tell = Tell(this)
 
     /** Today's date. */
     val today = today()
 
     /** Twitter module. */
-    val twitter: Twitter
+    val twitter: Twitter = Twitter(this)
 
     /** The backlogs URL. */
-    var backlogsUrl = ""
+    val backlogsUrl: String
 
     // Ident message
-    private var identMsg = ""
+    private val identMsg: String
 
     // Ident nick
-    private var identNick = ""
+    private val identNick: String
 
     // NickServ ident password
-    private var identPwd = ""
+    private val identPwd: String
 
     // Is pinboard enabled?
     private var isPinboardEnabled = false
@@ -163,7 +163,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     val timer = Timer(true)
 
     /** Weblog URL */
-    var weblogUrl = ""
+    val weblogUrl: String
 
     /** The current channel name. */
     private val channelName: String
@@ -212,7 +212,9 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                     connect(ircServer, ircPort)
                 } catch (ex: Exception) {
                     if (retries == MAX_RECONNECT) {
-                        logger.debug("Unable to reconnect to $ircServer, after $MAX_RECONNECT retries.", ex)
+                        if (logger.isDebugEnabled) {
+                            logger.debug("Unable to reconnect to $ircServer, after $MAX_RECONNECT retries.", ex)
+                        }
                         e.printStackTrace(System.err)
                         exitProcess(1)
                     }
@@ -350,7 +352,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         hostname: String,
         message: String
     ) {
-        logger.debug(">>> $sender: $message")
+        if (logger.isDebugEnabled) logger.debug(">>> $sender: $message")
         tell.send(sender, true)
         if (message.matches("(?i)${Pattern.quote(nick)}:.*".toRegex())) { // mobibot: <command>
             val cmds = message.substring(message.indexOf(':') + 1).trim().split(" ".toRegex(), 2)
@@ -396,9 +398,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         hostname: String,
         message: String
     ) {
-        if (logger.isDebugEnabled) {
-            logger.debug(">>> $sender : $message")
-        }
+        if (logger.isDebugEnabled) logger.debug(">>> $sender : $message")
         val cmds = message.split(" ".toRegex(), 2)
         val cmd = cmds[0].toLowerCase()
         val args = if (cmds.size > 1) {
@@ -467,10 +467,10 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     fun send(sender: String, message: String?, isPrivate: Boolean) {
         if (message != null && sender.isNotBlank()) {
             if (isPrivate) {
-                logger.debug("Sending message to $sender : $message")
+                if (logger.isDebugEnabled) logger.debug("Sending message to $sender : $message")
                 sendMessage(sender, message)
             } else {
-                logger.debug("Sending notice to $sender: $message")
+                if (logger.isDebugEnabled) logger.debug("Sending notice to $sender: $message")
                 sendNotice(sender, message)
             }
         }
@@ -597,7 +597,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
             try {
                 commandLine = parser.parse(options, args)
             } catch (e: ParseException) {
-                System.err.println("CLI Parsing failed.  Reason: ${e.message}")
+                System.err.println("CLI Parsing failed. Reason: ${e.message}")
                 e.printStackTrace(System.err)
                 exitProcess(1)
             }
@@ -684,13 +684,13 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         this.channel = channel
         logsDir = logsDirPath
 
-        // Set the default logger level
+        // Store the default logger level
         loggerLevel = logger.level
 
         // Load the current entries and backlogs, if any
         try {
             startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, this.channel)
-            logger.debug("Last feed: $startDate")
+            if (logger.isDebugEnabled) logger.debug("Last feed: $startDate")
         } catch (e: Exception) {
             logger.error("An error occurred while loading the logs.", e)
         }
@@ -712,7 +712,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         backlogsUrl = ensureDir(p.getProperty("backlogs", weblogUrl), true)
 
         // Set the pinboard authentication
-        setPinboardAuth(p.getProperty("pinboard-api-token"))
+        setPinboardAuth(p.getProperty("pinboard-api-token", ""))
 
         // Load the commands
         addons.add(AddLog(this), p)
@@ -730,7 +730,6 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         addons.add(Versions(this), p)
 
         // Tell command
-        tell = Tell(this)
         addons.add(tell, p)
 
         // Load the links commands
@@ -755,7 +754,6 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         addons.add(WorldTime(this), p)
 
         // Twitter module
-        twitter = Twitter(this)
         addons.add(twitter, p)
 
         // Sort the addons
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
index 168a0cf..e6341f8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -36,7 +36,6 @@ import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import java.time.Clock
 import java.time.LocalDateTime
-import java.util.*
 
 class Recap(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "recap"
@@ -49,7 +48,7 @@ class Recap(bot: Mobibot) : AbstractCommand(bot) {
     override val isVisible = true
 
     companion object {
-        private val recaps = ArrayList<String>(0)
+        private val recaps = mutableListOf<String>()
 
         @JvmStatic
         fun recapCount(): Int {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index 49d1130..0315560 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -35,7 +35,6 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import org.jibble.pircbot.User
-import java.util.*
 
 class Users(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "users"
@@ -56,7 +55,7 @@ class Users(bot: Mobibot) : AbstractCommand(bot) {
         isPrivate: Boolean
     ) {
         val users: Array<User> = bot.getUsers(bot.channel)
-        val nicks = ArrayList<String>()
+        val nicks = mutableListOf<String>()
         users.forEach { user ->
             if (bot.isOp(user.nick)) {
                 nicks.add("@${user.nick}")
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index cd4104b..f246760 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -44,8 +44,8 @@ import org.jsoup.Jsoup
 import java.io.IOException
 
 class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
-    private val keywords: MutableList<String> = ArrayList()
-    private val defaultTags: MutableList<String> = ArrayList()
+    private val keywords: MutableList<String> = mutableListOf()
+    private val defaultTags: MutableList<String> = mutableListOf()
 
     override val name = Constants.LINK_CMD
     override val help = emptyList<String>()
@@ -65,11 +65,11 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
 
         // Entries array
         @JvmField
-        val entries = ArrayList<EntryLink>(0)
+        val entries = mutableListOf<EntryLink>()
 
         // History/backlogs array
         @JvmField
-        val history = ArrayList<String>(0)
+        val history = mutableListOf<String>()
 
 
         @JvmStatic
@@ -207,7 +207,7 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         return false
     }
 
-    private fun matchTagKeywords(title: String, tags: ArrayList<String>) {
+    private fun matchTagKeywords(title: String, tags: MutableList<String>) {
         for (match in keywords) {
             val m = Regex.escape(match)
             if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index c0e97d0..f79bb4c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -41,14 +41,13 @@ import net.thauvin.erik.mobibot.Utils.Companion.reverseColor
 import net.thauvin.erik.mobibot.Utils.Companion.utcDateTime
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.View
-import java.util.concurrent.CopyOnWriteArrayList
 
 /**
  * The `Tell` command.
  */
 class Tell(bot: Mobibot) : AbstractCommand(bot) {
     // Messages queue
-    private val messages: MutableList<TellMessage> = CopyOnWriteArrayList()
+    private val messages: MutableList<TellMessage> = mutableListOf()
 
     // Serialized object file
     private val serializedObject: String
@@ -63,9 +62,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
      * Cleans the messages queue.
      */
     private fun clean(): Boolean {
-        if (bot.logger.isDebugEnabled) {
-            bot.logger.debug("Cleaning the messages.")
-        }
+        if (bot.logger.isDebugEnabled) bot.logger.debug("Cleaning the messages.")
         return TellMessagesMgr.clean(messages, maxDays)
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
index 3f8710a..f3907ec 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -66,9 +66,7 @@ internal class TellMessagesMgr private constructor() {
                 ObjectInputStream(
                     BufferedInputStream(Files.newInputStream(Paths.get(file)))
                 ).use { input ->
-                    if (logger.isDebugEnabled) {
-                        logger.debug("Loading the messages.")
-                    }
+                    if (logger.isDebugEnabled) logger.debug("Loading the messages.")
                     @Suppress("UNCHECKED_CAST")
                     return input.readObject() as List<TellMessage>
                 }
@@ -79,7 +77,7 @@ internal class TellMessagesMgr private constructor() {
             } catch (e: ClassNotFoundException) {
                 logger.error("An error occurred loading the messages queue.", e)
             }
-            return ArrayList()
+            return listOf()
         }
 
         /**
@@ -89,9 +87,7 @@ internal class TellMessagesMgr private constructor() {
             try {
                 BufferedOutputStream(Files.newOutputStream(Paths.get(file))).use { bos ->
                     ObjectOutputStream(bos).use { output ->
-                        if (logger.isDebugEnabled) {
-                            logger.debug("Saving the messages.")
-                        }
+                        if (logger.isDebugEnabled) logger.debug("Saving the messages.")
                         output.writeObject(messages)
                     }
                 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index f8e9a43..54ba3e6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -48,7 +48,6 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.*
-import kotlin.collections.ArrayList
 
 /**
  * Manages the feed entries.
@@ -79,7 +78,7 @@ class EntriesMgr private constructor() {
          * Loads the backlogs.
          */
         @Throws(IOException::class, FeedException::class)
-        fun loadBacklogs(file: String, history: ArrayList<String>) {
+        fun loadBacklogs(file: String, history: MutableList<String>) {
             history.clear()
             val input = SyndFeedInput()
             InputStreamReader(Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8).use { reader ->
@@ -95,7 +94,7 @@ class EntriesMgr private constructor() {
          * Loads the current entries.
          */
         @Throws(IOException::class, FeedException::class)
-        fun loadEntries(file: String, channel: String, entries: ArrayList<EntryLink>): String {
+        fun loadEntries(file: String, channel: String, entries: MutableList<EntryLink>): String {
             entries.clear()
             val input = SyndFeedInput()
             var today: String
@@ -139,14 +138,12 @@ class EntriesMgr private constructor() {
             history: MutableList<String>,
             isDayBackup: Boolean
         ) {
-            if (bot.logger.isDebugEnabled) {
-                bot.logger.debug("Saving the feeds...")
-            }
+            if (bot.logger.isDebugEnabled) bot.logger.debug("Saving the feeds...")
             if (bot.logsDir.isNotBlank() && bot.weblogUrl.isNotBlank()) {
                 try {
                     val output = SyndFeedOutput()
                     var rss: SyndFeed = SyndFeedImpl()
-                    val items: MutableList<SyndEntry> = ArrayList(0)
+                    val items: MutableList<SyndEntry> = mutableListOf()
                     var item: SyndEntry
                     OutputStreamWriter(
                         Files.newOutputStream(Paths.get(bot.logsDir + CURRENT_XML)), StandardCharsets.UTF_8
@@ -194,9 +191,7 @@ class EntriesMgr private constructor() {
                             }
                         }
                         rss.entries = items
-                        if (bot.logger.isDebugEnabled) {
-                            bot.logger.debug("Writing the entries feed.")
-                        }
+                        if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the entries feed.")
                         output.output(rss, fw)
                     }
                     OutputStreamWriter(
@@ -238,9 +233,7 @@ class EntriesMgr private constructor() {
                                     items.add(item)
                                 }
                                 rss.entries = items
-                                if (bot.logger.isDebugEnabled) {
-                                    bot.logger.debug("Writing the backlog feed.")
-                                }
+                                if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the backlog feed.")
                                 output.output(rss, fw)
                             }
                         } else {
@@ -248,12 +241,14 @@ class EntriesMgr private constructor() {
                         }
                     }
                 } catch (e: FeedException) {
-                    bot.logger.warn("Unable to generate the entries feed.", e)
+                    if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
                 } catch (e: IOException) {
-                    bot.logger.warn("Unable to generate the entries feed.", e)
+                    if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
                 }
             } else {
-                bot.logger.warn("Unable to generate the entries feed. A required property is missing.")
+                if (bot.logger.isWarnEnabled) {
+                    bot.logger.warn("Unable to generate the entries feed. A required property is missing.")
+                }
             }
         }
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
index 5d6eea2..a33a180 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -37,17 +37,16 @@ import net.thauvin.erik.mobibot.commands.links.LinksMgr
 import org.apache.commons.lang3.StringUtils
 import java.io.Serializable
 import java.util.*
-import java.util.concurrent.CopyOnWriteArrayList
 
 /**
  * The class used to store link entries.
  */
 class EntryLink : Serializable {
     // Link's comments
-    val comments: MutableList<EntryComment> = CopyOnWriteArrayList()
+    val comments: MutableList<EntryComment> = mutableListOf()
 
     // Tags/categories
-    val tags: MutableList<SyndCategory> = CopyOnWriteArrayList()
+    val tags: MutableList<SyndCategory> = mutableListOf()
 
     // Channel
     var channel: String
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index f4f36a7..eb97e4f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -33,8 +33,6 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
-import java.util.*
-import java.util.concurrent.ConcurrentHashMap
 
 /**
  * The `Module` abstract class.
@@ -44,11 +42,11 @@ abstract class AbstractModule(val bot: Mobibot) {
      * The module's commands, if any.
      */
     @JvmField
-    val commands: MutableList<String> = ArrayList()
+    val commands: MutableList<String> = mutableListOf()
 
     @JvmField
-    val help: MutableList<String> = ArrayList()
-    val properties: MutableMap<String, String> = ConcurrentHashMap()
+    val help: MutableList<String> = mutableListOf()
+    val properties: MutableMap<String, String> = mutableMapOf()
 
     /**
      * Responds to a command.
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index f15c184..9038a7a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -43,7 +43,6 @@ import org.jdom2.input.SAXBuilder
 import java.io.IOException
 import java.net.URL
 import java.text.NumberFormat
-import java.util.*
 import javax.xml.XMLConstants
 
 /**
@@ -73,7 +72,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 try {
                     loadRates()
                 } catch (e: ModuleException) {
-                    logger.warn(e.debugMessage, e)
+                    if (bot.logger.isWarnEnabled)logger.warn(e.debugMessage, e)
                 }
             }
 
@@ -100,7 +99,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 try {
                     loadRates()
                 } catch (e: ModuleException) {
-                    logger.debug(e.debugMessage, e)
+                    if (logger.isDebugEnabled) logger.debug(e.debugMessage, e)
                 }
             }
             if (EXCHANGE_RATES.isEmpty()) {
@@ -139,7 +138,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         private const val EMPTY_RATE_TABLE = "Sorry, but the exchange rate table is empty."
 
         // Exchange rates
-        private val EXCHANGE_RATES: MutableMap<String, String> = TreeMap()
+        private val EXCHANGE_RATES: MutableMap<String, String> = mutableMapOf()
 
         // Exchange rates table URL
         private const val EXCHANGE_TABLE_URL = "https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml"
@@ -183,7 +182,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
 
         @JvmStatic
         fun currencyRates(): List<String> {
-            val rates = ArrayList<String>(33)
+            val rates = mutableListOf<String>()
             for ((key, value) in EXCHANGE_RATES) {
                 rates.add("  $key: ${StringUtils.leftPad(value, 8)}")
             }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index b9c78d0..687ce17 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -41,7 +41,6 @@ import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
 import java.net.URL
-import java.util.*
 
 /**
  * The GoogleSearch module.
@@ -62,7 +61,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
                         send(sender, msg)
                     }
                 } catch (e: ModuleException) {
-                    logger.warn(e.debugMessage, e)
+                    if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
                     send(sender, e.message, isPrivate)
                 }
             } else {
@@ -91,7 +90,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
                 throw ModuleException("${StringUtils.capitalize(GOOGLE_CMD)} is disabled. The API keys are missing.")
             }
             return if (query.isNotBlank()) {
-                val results = ArrayList<Message>()
+                val results = mutableListOf<Message>()
                 try {
                     val url = URL(
                         "https://www.googleapis.com/customsearch/v1?key=$apiKey&cx=$cseKey" +
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
index 26383e2..bc760b2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -60,7 +60,7 @@ class Joke(bot: Mobibot) : ThreadedModule(bot) {
         try {
             bot.send(Utils.cyan(randomJoke().msg))
         } catch (e: ModuleException) {
-            bot.logger.warn(e.debugMessage, e)
+            if (bot.logger.isWarnEnabled) bot.logger.warn(e.debugMessage, e)
             bot.send(sender, e.message, isPrivate)
         }
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
index 91954b6..32557bd 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -76,7 +76,9 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
                                 send("Unknown host.")
                             }
                         } catch (ioe: IOException) {
-                            logger.debug("Unable to perform whois IP lookup: {}", args, ioe)
+                            if (logger.isDebugEnabled) {
+                                logger.debug("Unable to perform whois IP lookup: $args", ioe)
+                            }
                             send("Unable to perform whois IP lookup: ${ioe.message}")
                         }
                     } else {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 702077a..5e4ae34 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -41,7 +41,6 @@ import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
 import java.net.URL
-import java.util.*
 
 /**
  * The StockQuote module.
@@ -59,7 +58,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                         send(sender, msg)
                     }
                 } catch (e: ModuleException) {
-                    logger.warn(e.debugMessage, e)
+                    if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
                     send(e.message)
                 }
             } else {
@@ -126,7 +125,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
             }
             return if (symbol.isNotBlank()) {
                 val debugMessage = "getQuote($symbol)"
-                val messages = ArrayList<Message>()
+                val messages = mutableListOf<Message>()
                 var response: String
                 try {
                     with(messages) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
index ef648c8..9a7ac28 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -91,11 +91,9 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
                 Thread {
                     try {
                         post(message = msg, isDm = true)
-                        if (logger.isDebugEnabled) {
-                            logger.debug("Notified @{}: {}", handle, msg)
-                        }
+                        if (logger.isDebugEnabled) logger.debug("Notified @$handle: $msg")
                     } catch (e: ModuleException) {
-                        logger.warn("Failed to notify @{}: {}", handle, msg, e)
+                        if (logger.isWarnEnabled) logger.warn("Failed to notify @$handle: $msg", e)
                     }
                 }.start()
             }
@@ -133,7 +131,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
                         }
                         post(message = msg, isDm = false)
                     } catch (e: ModuleException) {
-                        logger.warn("Failed to post entry on Twitter.", e)
+                        if (bot.logger.isWarnEnabled) logger.warn("Failed to post entry on Twitter.", e)
                     }
                 }.start()
                 removeEntry(index)
@@ -167,7 +165,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
                     isPrivate
                 )
             } catch (e: ModuleException) {
-                logger.warn(e.debugMessage, e)
+                if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
                 send(sender, e.message, isPrivate)
             }
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index 5595519..ab2e385 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -42,7 +42,6 @@ import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
 import net.thauvin.erik.mobibot.msg.PublicMessage
 import org.jibble.pircbot.Colors
-import java.util.*
 import kotlin.math.roundToInt
 
 /**
@@ -64,7 +63,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                     }
                 }
             } catch (e: ModuleException) {
-                bot.logger.debug(e.debugMessage, e)
+                if (bot.logger.isDebugEnabled) bot.logger.debug(e.debugMessage, e)
                 bot.send(e.message)
             }
         } else {
@@ -104,7 +103,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                 throw ModuleException("${WEATHER_CMD.capitalize()} is disabled. The API key is missing.")
             }
             val owm = OWM(apiKey)
-            val messages = ArrayList<Message>()
+            val messages = mutableListOf<Message>()
             owm.unit = OWM.Unit.IMPERIAL
             if (query.isNotBlank()) {
                 val argv = query.split(",")
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 835fcca..3338439 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -41,6 +41,7 @@ import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoField
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * The WorldTime module.
@@ -94,7 +95,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
 
         init {
             // Initialize the countries map
-            val countries = TreeMap<String, String>()
+            val countries = mutableMapOf<String, String>()
             countries["AE"] = "Asia/Dubai"
             countries["AF"] = "Asia/Kabul"
             countries["AQ"] = "Antarctica/South_Pole"

From b109ce2de5b0ae4414b3672f99cfa8279b4bc925 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 6 Dec 2020 01:49:37 -0800
Subject: [PATCH 102/262] Version 0.8.0-beta+346

---
 version.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version.properties b/version.properties
index 0f713d3..df4e27a 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Dec 04 22:59:43 PST 2020
-version.buildmeta=337
+#Sun Dec 06 01:19:28 PST 2020
+version.buildmeta=346
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+337
+version.semver=0.8.0-beta+346

From 625ef1368cc233905476ae099640d4dd8ab4e5f4 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 6 Dec 2020 02:00:36 -0800
Subject: [PATCH 103/262] Updated baseline.

---
 config/detekt/baseline.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 7d60806..5d4c70d 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -53,6 +53,7 @@
     <ID>MemberNameEqualsClassName:WorldTime.kt$WorldTime.Companion$ @JvmStatic fun worldTime(query: String): Message</ID>
     <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)</ID>
     <ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
     <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ @Throws(IOException::class, FeedException::class) fun loadEntries(file: String, channel: String, entries: MutableList&lt;EntryLink&gt;): String</ID>

From 250c52b7d50ca3b50e279f555d9dc156dcf28ddc Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 6 Dec 2020 02:39:24 -0800
Subject: [PATCH 104/262] Reverted Tell and Twitter initializations to the init
 stage.

---
 src/main/java/net/thauvin/erik/mobibot/Mobibot.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index dcdd5a2..bb03e89 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -136,13 +136,13 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     private val pinboard: PinboardPoster = PinboardPoster()
 
     /** Tell command. */
-    val tell: Tell = Tell(this)
+    val tell: Tell
 
     /** Today's date. */
     val today = today()
 
     /** Twitter module. */
-    val twitter: Twitter = Twitter(this)
+    val twitter: Twitter
 
     /** The backlogs URL. */
     val backlogsUrl: String
@@ -730,6 +730,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         addons.add(Versions(this), p)
 
         // Tell command
+        tell = Tell(this)
         addons.add(tell, p)
 
         // Load the links commands
@@ -754,6 +755,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         addons.add(WorldTime(this), p)
 
         // Twitter module
+        twitter = Twitter(this)
         addons.add(twitter, p)
 
         // Sort the addons

From f6656f116662a6d9191f2ced5901e66eef35a6ff Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 6 Dec 2020 02:39:36 -0800
Subject: [PATCH 105/262] Version 0.8.0-beta+350

---
 version.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version.properties b/version.properties
index df4e27a..254cc73 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sun Dec 06 01:19:28 PST 2020
-version.buildmeta=346
+#Sun Dec 06 02:35:51 PST 2020
+version.buildmeta=350
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+346
+version.semver=0.8.0-beta+350

From 1c2234a9a24184e490c4f1c76e228fa0353b3e90 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 6 Dec 2020 16:02:05 -0800
Subject: [PATCH 106/262] Added Debug command. Converted Utils classes to
 objects.

---
 .idea/mobibot.iml                             |   2 +-
 .idea/modules/mobibot.main.iml                |  63 ++-
 .idea/modules/mobibot.test.iml                |  92 ++--
 build.gradle                                  |   2 +-
 config/detekt/baseline.xml                    |  11 +-
 .../net/thauvin/erik/mobibot/Constants.kt     |   7 +-
 .../java/net/thauvin/erik/mobibot/Mobibot.kt  |  30 +-
 .../net/thauvin/erik/mobibot/PinboardUtils.kt |   2 +-
 .../java/net/thauvin/erik/mobibot/Utils.kt    | 461 +++++++++---------
 .../thauvin/erik/mobibot/commands/Debug.kt    |  58 +++
 .../erik/mobibot/commands/tell/Tell.kt        |  14 +-
 .../mobibot/commands/tell/TellMessagesMgr.kt  |   1 -
 .../erik/mobibot/entries/EntriesMgr.kt        |   2 +-
 .../erik/mobibot/entries/EntriesUtils.kt      |  79 ++-
 .../erik/mobibot/modules/CurrencyConverter.kt |   2 +-
 .../net/thauvin/erik/mobibot/msg/Message.kt   |  12 +-
 .../net/thauvin/erik/mobibot/UtilsTest.java   | 160 ------
 .../net/thauvin/erik/mobibot/UtilsTest.kt     | 172 +++++++
 .../erik/mobibot/modules/LookupTest.kt        |   1 -
 19 files changed, 605 insertions(+), 566 deletions(-)
 create mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
 delete mode 100644 src/test/java/net/thauvin/erik/mobibot/UtilsTest.java
 create mode 100644 src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt

diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
index 85e216a..255f0c1 100644
--- a/.idea/mobibot.iml
+++ b/.idea/mobibot.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+327" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+359" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
index 4c00984..c12d92e 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+327" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+359" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -54,34 +54,6 @@
       <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
@@ -95,7 +67,34 @@
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
+    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
+    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
+    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 822bffe..9e64bd2 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+327" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+359" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="kotlin-language" name="Kotlin">
       <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
@@ -8,7 +8,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/media/erik/Projects/java/mobibot/build/tmp/kapt3/classes/main:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.18.1/aaa02680dd92a568a4278bb40aa4a6305f632ec0/assertj-core-3.18.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
+          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/media/erik/Projects/java/mobibot/build/tmp/kapt3/classes/main:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.18.1/aaa02680dd92a568a4278bb40aa4a6305f632ec0/assertj-core-3.18.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="mobibot" />
@@ -63,6 +63,49 @@
       <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
+    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
+    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.21" level="project" />
+    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
+    <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
+    <orderEntry type="library" name="Gradle: org.testng:testng:7.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.18.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
+    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.inject:guice:no_aop:4.2.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.78" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.10.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
+    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
+    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.guava:guava:25.1-android" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.ant:ant-launcher:1.10.3" level="project" />
+    <orderEntry type="library" name="Gradle: org.checkerframework:checker-compat-qual:2.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="Gradle: kaptGeneratedClasses">
@@ -77,51 +120,6 @@
     <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
     <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
-    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.18.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.testng:testng:7.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.inject:guice:no_aop:4.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.78" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.10.3" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:25.1-android" level="project" />
-    <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.ant:ant-launcher:1.10.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.checkerframework:checker-compat-qual:2.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.j2objc:j2objc-annotations:1.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.6" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="mobibot.main" />
 </module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9ff3602..8c0d5f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@ repositories {
 
 dependencies {
     kapt(semverProcessor)
-    implementation(semverProcessor)
+    compileOnly(semverProcessor)
 
     implementation 'pircbot:pircbot:1.5.0'
     compileOnly 'pircbot:pircbot:1.5.0:sources'
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 5d4c70d..dc51202 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -3,8 +3,8 @@
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
     <ID>ComplexMethod:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
-    <ID>ComplexMethod:Mobibot.kt$Mobibot$override fun onPrivateMessage( sender: String, login: String, hostname: String, message: String )</ID>
     <ID>ComplexMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>EmptyDefaultConstructor:Message.kt$Message$()</ID>
     <ID>LongMethod:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
     <ID>LongMethod:Mobibot.kt$Mobibot.Companion$ @JvmStatic fun main(args: Array&lt;String&gt;)</ID>
     <ID>LongMethod:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
@@ -35,9 +35,9 @@
     <ID>MagicNumber:Twitter.kt$Twitter$1000L</ID>
     <ID>MagicNumber:Twitter.kt$Twitter$60L</ID>
     <ID>MagicNumber:Users.kt$Users$8</ID>
-    <ID>MagicNumber:Utils.kt$Utils.Companion$30</ID>
-    <ID>MagicNumber:Utils.kt$Utils.Companion$365</ID>
-    <ID>MagicNumber:Utils.kt$Utils.Companion$7</ID>
+    <ID>MagicNumber:Utils.kt$Utils$30</ID>
+    <ID>MagicNumber:Utils.kt$Utils$365</ID>
+    <ID>MagicNumber:Utils.kt$Utils$7</ID>
     <ID>MagicNumber:View.kt$View$8</ID>
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$1.60934</ID>
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$32</ID>
@@ -75,7 +75,6 @@
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>ReturnCount:Mobibot.kt$Mobibot$override fun onMessage( channel: String, sender: String, login: String, hostname: String, message: String )</ID>
-    <ID>ReturnCount:Utils.kt$Utils.Companion$ @JvmStatic fun colorize(s: String?, color: String): String</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
@@ -87,6 +86,6 @@
     <ID>TooGenericExceptionCaught:Weather2.kt$Weather2.Companion$e: NullPointerException</ID>
     <ID>TooManyFunctions:Mobibot.kt$Mobibot : PircBot</ID>
     <ID>TooManyFunctions:Tell.kt$Tell : AbstractCommand</ID>
-    <ID>TooManyFunctions:Utils.kt$Utils$Companion</ID>
+    <ID>TooManyFunctions:Utils.kt$Utils$Utils</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.kt b/src/main/java/net/thauvin/erik/mobibot/Constants.kt
index 4f3d1ae..575e29a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.kt
@@ -34,7 +34,7 @@ package net.thauvin.erik.mobibot
 import java.util.*
 
 /**
- * The `Constants` class.
+ * The `Constants`.
  */
 object Constants {
     /**
@@ -77,6 +77,11 @@ object Constants {
      */
     const val HELP_CMD = "help"
 
+    /**
+     * The kill command.
+     */
+    const val KILL_CMD = "kill"
+
     /**
      * The link command.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index bb03e89..e6c1f8b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -34,16 +34,17 @@ package net.thauvin.erik.mobibot
 import net.thauvin.erik.mobibot.PinboardUtils.addPin
 import net.thauvin.erik.mobibot.PinboardUtils.deletePin
 import net.thauvin.erik.mobibot.PinboardUtils.updatePin
-import net.thauvin.erik.mobibot.Utils.Companion.colorize
-import net.thauvin.erik.mobibot.Utils.Companion.ensureDir
-import net.thauvin.erik.mobibot.Utils.Companion.getIntProperty
-import net.thauvin.erik.mobibot.Utils.Companion.helpFormat
-import net.thauvin.erik.mobibot.Utils.Companion.helpIndent
-import net.thauvin.erik.mobibot.Utils.Companion.isoLocalDate
-import net.thauvin.erik.mobibot.Utils.Companion.today
+import net.thauvin.erik.mobibot.Utils.colorize
+import net.thauvin.erik.mobibot.Utils.ensureDir
+import net.thauvin.erik.mobibot.Utils.getIntProperty
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.helpIndent
+import net.thauvin.erik.mobibot.Utils.isoLocalDate
+import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.commands.AddLog
 import net.thauvin.erik.mobibot.commands.ChannelFeed
 import net.thauvin.erik.mobibot.commands.Cycle
+import net.thauvin.erik.mobibot.commands.Debug
 import net.thauvin.erik.mobibot.commands.Ignore
 import net.thauvin.erik.mobibot.commands.Info
 import net.thauvin.erik.mobibot.commands.Me
@@ -92,7 +93,6 @@ import org.apache.commons.cli.ParseException
 import org.apache.logging.log4j.Level
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
-import org.apache.logging.log4j.core.config.Configurator
 import org.jibble.pircbot.PircBot
 import java.io.BufferedOutputStream
 import java.io.FileNotFoundException
@@ -126,8 +126,8 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     /** Logger. */
     val logger: Logger = LogManager.getLogger(Mobibot::class.java)
 
-    // Logger default level
-    private val loggerLevel: Level
+    /** Logger default level. */
+    val loggerLevel: Level
 
     /** Log directory. */
     val logsDir: String
@@ -407,17 +407,10 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         val isOp = isOp(sender)
         if (cmd.startsWith(Constants.HELP_CMD)) { // help
             helpResponse(sender, args, true)
-        } else if (isOp && "kill" == cmd) { // kill
+        } else if (isOp && Constants.KILL_CMD == cmd) { // kill
             twitter.notification("$name killed by $sender on $channel")
             sendRawLine("QUIT : Poof!")
             exitProcess(0)
-        } else if (isOp && Constants.DEBUG_CMD == cmd) { // debug
-            if (logger.isDebugEnabled) {
-                Configurator.setLevel(logger.name, loggerLevel)
-            } else {
-                Configurator.setLevel(logger.name, Level.DEBUG)
-            }
-            send(sender, "Debug logging is " + if (logger.isDebugEnabled) "enabled." else "disabled.", true)
         } else if (isOp && Constants.DIE_CMD == cmd) { // die
             send("$sender has just signed my death sentence.")
             timer.cancel()
@@ -718,6 +711,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         addons.add(AddLog(this), p)
         addons.add(ChannelFeed(this, channelName), p)
         addons.add(Cycle(this), p)
+        addons.add(Debug(this), p)
         addons.add(Ignore(this), p)
         addons.add(Info(this), p)
         addons.add(Me(this), p)
diff --git a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
index 1dad880..addf76b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -43,7 +43,7 @@ import java.time.format.DateTimeFormatter
 import java.util.*
 
 /**
- * The class to handle posts to pinboard.in.
+ * Handles posts to pinboard.in.
  */
 object PinboardUtils {
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index 09f7062..1aa1829 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -49,261 +49,240 @@ import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
 
 /**
- * Miscellaneous utilities class.
+ * Miscellaneous utilities.
  */
-class Utils private constructor() {
-    companion object {
-        private val searchFlags = arrayOf("%c", "%n")
+object Utils {
+    private val searchFlags = arrayOf("%c", "%n")
 
-        /**
-         * Makes the given int bold.
-         */
-        @JvmStatic
-        fun bold(i: Int): String {
-            return bold(i.toString())
+    /**
+     * Makes the given int bold.
+     */
+    @JvmStatic
+    fun bold(i: Int): String = bold(i.toString())
+
+    /**
+     * Makes the given string bold.
+     */
+    @JvmStatic
+    fun bold(s: String?): String = colorize(s, Colors.BOLD)
+
+    /**
+     * Colorize a string.
+     */
+    @JvmStatic
+    fun colorize(s: String?, color: String): String {
+        return if (s.isNullOrBlank()) {
+            Colors.NORMAL
+        } else if (Colors.BOLD == color || Colors.REVERSE == color) {
+            color + s + color
+        } else {
+            color + s + Colors.NORMAL
         }
+    }
 
-        /**
-         * Makes the given string bold.
-         */
-        @JvmStatic
-        fun bold(s: String?): String {
-            return colorize(s, Colors.BOLD)
-        }
+    /**
+     * Makes the given string cyan.
+     */
+    @JvmStatic
+    fun cyan(s: String?): String = colorize(s, Colors.CYAN)
 
-        /**
-         * Colorize a string.
-         */
-        @JvmStatic
-        fun colorize(s: String?, color: String): String {
-            if (s.isNullOrBlank()) {
-                return Colors.NORMAL
-            } else if (Colors.BOLD == color || Colors.REVERSE == color) {
-                return color + s + color
-            }
-            return color + s + Colors.NORMAL
-        }
+    /**
+     * URL encodes the given string.
+     */
+    fun encodeUrl(s: String): String = URLEncoder.encode(s, StandardCharsets.UTF_8)
 
-        /**
-         * Makes the given string cyan.
-         */
-        @JvmStatic
-        fun cyan(s: String?): String {
-            return colorize(s, Colors.CYAN)
-        }
-
-        /**
-         * URL encodes the given string.
-         */
-        fun encodeUrl(s: String): String {
-            return URLEncoder.encode(s, StandardCharsets.UTF_8)
-        }
-
-        /**
-         * Ensures that the given location (File/URL) has a trailing slash (`/`) to indicate a directory.
-         */
-        @JvmStatic
-        fun ensureDir(location: String, isUrl: Boolean): String {
-            return if (location.isNotEmpty()) {
-                if (isUrl) {
-                    if (location[location.length - 1] == '/') {
-                        location
-                    } else {
-                        "$location/"
-                    }
+    /**
+     * Ensures that the given location (File/URL) has a trailing slash (`/`) to indicate a directory.
+     */
+    @JvmStatic
+    fun ensureDir(location: String, isUrl: Boolean): String {
+        return if (location.isNotEmpty()) {
+            if (isUrl) {
+                if (location[location.length - 1] == '/') {
+                    location
                 } else {
-                    if (location[location.length - 1] == File.separatorChar) {
-                        location
-                    } else {
-                        location + File.separatorChar
-                    }
+                    "$location/"
                 }
             } else {
-                location
+                if (location[location.length - 1] == File.separatorChar) {
+                    location
+                } else {
+                    location + File.separatorChar
+                }
             }
+        } else {
+            location
         }
+    }
 
-        /**
-         * Returns a property as an int.
-         */
-        @JvmStatic
-        fun getIntProperty(property: String?, def: Int): Int {
-            return if (property == null) {
+    /**
+     * Returns a property as an int.
+     */
+    @JvmStatic
+    fun getIntProperty(property: String?, def: Int): Int {
+        return if (property == null) {
+            def
+        } else {
+            try {
+                property.toInt()
+            } catch (ignore: NumberFormatException) {
                 def
-            } else {
-                try {
-                    property.toInt()
-                } catch (ignore: NumberFormatException) {
-                    def
-                }
-            }
-        }
-
-        /**
-         * Makes the given string green.
-         */
-        @JvmStatic
-        fun green(s: String?): String {
-            return colorize(s, Colors.DARK_GREEN)
-        }
-
-        /**
-         * Formats a help command by replacing `%c` with the bot's pub/priv command, and `%n` with the bot's
-         * nick.
-         */
-        @JvmStatic
-        fun helpFormat(text: String, botNick: String, isPrivate: Boolean): String {
-            val replace = arrayOf(if (isPrivate) "/msg $botNick" else "$botNick:", botNick)
-            return StringUtils.replaceEach(text, searchFlags, replace)
-        }
-
-        /**
-         * Returns indented help string.
-         */
-        @JvmStatic
-        @JvmOverloads
-        fun helpIndent(help: String, isBold: Boolean = true): String {
-            return "      " + if (isBold) bold(help) else help
-        }
-
-        /**
-         * Returns the specified date as an ISO local date string.
-         */
-        @JvmStatic
-        fun isoLocalDate(date: Date): String {
-            return isoLocalDate(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()))
-        }
-
-        /**
-         * Returns the specified date as an ISO local date string.
-         */
-        @JvmStatic
-        fun isoLocalDate(date: LocalDateTime): String {
-            return date.format(DateTimeFormatter.ISO_LOCAL_DATE)
-        }
-
-        /**
-         * Obfuscates the given string.
-         */
-        @JvmStatic
-        fun obfuscate(s: String): String {
-            return if (s.isNotBlank()) {
-                StringUtils.repeat('x', s.length)
-            } else s
-        }
-
-        /**
-         * Returns the plural form of a word, if count &gt; 1.
-         */
-        @JvmStatic
-        fun plural(count: Long, word: String, plural: String): String {
-            return if (count > 1) {
-                plural
-            } else {
-                word
-            }
-        }
-
-        /**
-         * Makes the given string red.
-         */
-        @JvmStatic
-        fun red(s: String?): String {
-            return colorize(s, Colors.RED)
-        }
-
-        /**
-         * Makes the given string reverse color.
-         */
-        @JvmStatic
-        fun reverseColor(s: String?): String {
-            return colorize(s, Colors.REVERSE)
-        }
-
-        /**
-         * Returns today's date.
-         */
-        @JvmStatic
-        fun today(): String {
-            return isoLocalDate(LocalDateTime.now())
-        }
-
-        /**
-         * Converts XML/XHTML entities to plain text.
-         */
-        @JvmStatic
-        fun unescapeXml(str: String): String {
-            return Jsoup.parse(str).text()
-        }
-
-        /**
-         * Converts milliseconds to year month week day hour and minutes.
-         */
-        @JvmStatic
-        fun uptime(uptime: Long): String {
-            val info = StringBuilder()
-            var days = TimeUnit.MILLISECONDS.toDays(uptime)
-            val years = days / 365
-            days %= 365
-            val months = days / 30
-            days %= 30
-            val weeks = days / 7
-            days %= 7
-            val hours = TimeUnit.MILLISECONDS.toHours(uptime) - TimeUnit.DAYS.toHours(
-                TimeUnit.MILLISECONDS.toDays(uptime)
-            )
-            val minutes = TimeUnit.MILLISECONDS.toMinutes(uptime) - TimeUnit.HOURS.toMinutes(
-                TimeUnit.MILLISECONDS.toHours(uptime)
-            )
-            with(info) {
-                if (years > 0) {
-                    append(years).append(plural(years, " year ", " years "))
-                }
-                if (months > 0) {
-                    append(weeks).append(plural(months, " month ", " months "))
-                }
-                if (weeks > 0) {
-                    append(weeks).append(plural(weeks, " week ", " weeks "))
-                }
-                if (days > 0) {
-                    append(days).append(plural(days, " day ", " days "))
-                }
-                if (hours > 0) {
-                    append(hours).append(plural(hours, " hour ", " hours "))
-                }
-                append(minutes).append(plural(minutes, " minute", " minutes"))
-                return toString()
-            }
-        }
-
-        /**
-         * Reads contents of a URL.
-         */
-        @JvmStatic
-        @Throws(IOException::class)
-        fun urlReader(url: URL): String {
-            BufferedReader(InputStreamReader(url.openStream(), StandardCharsets.UTF_8))
-                .use { reader -> return reader.lines().collect(Collectors.joining(System.lineSeparator())) }
-        }
-
-        /**
-         * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
-         */
-        @JvmStatic
-        fun utcDateTime(date: Date): String {
-            return utcDateTime(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()))
-        }
-
-        /**
-         * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
-         */
-        @JvmStatic
-        fun utcDateTime(date: LocalDateTime?): String {
-            return if (date != null) {
-                date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
-            } else {
-                ""
             }
         }
     }
+
+    /**
+     * Makes the given string green.
+     */
+    @JvmStatic
+    fun green(s: String?): String = colorize(s, Colors.DARK_GREEN)
+
+    /**
+     * Formats a help command by replacing `%c` with the bot's pub/priv command, and `%n` with the bot's
+     * nick.
+     */
+    @JvmStatic
+    fun helpFormat(text: String, botNick: String, isPrivate: Boolean): String {
+        val replace = arrayOf(if (isPrivate) "/msg $botNick" else "$botNick:", botNick)
+        return StringUtils.replaceEach(text, searchFlags, replace)
+    }
+
+    /**
+     * Returns indented help string.
+     */
+    @JvmStatic
+    @JvmOverloads
+    fun helpIndent(help: String, isBold: Boolean = true): String {
+        return "      " + if (isBold) bold(help) else help
+    }
+
+    /**
+     * Returns the specified date as an ISO local date string.
+     */
+    @JvmStatic
+    fun isoLocalDate(date: Date): String {
+        return isoLocalDate(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()))
+    }
+
+    /**
+     * Returns the specified date as an ISO local date string.
+     */
+    @JvmStatic
+    fun isoLocalDate(date: LocalDateTime): String = date.format(DateTimeFormatter.ISO_LOCAL_DATE)
+
+    /**
+     * Obfuscates the given string.
+     */
+    @JvmStatic
+    fun obfuscate(s: String): String {
+        return if (s.isNotBlank()) {
+            StringUtils.repeat('x', s.length)
+        } else s
+    }
+
+    /**
+     * Returns the plural form of a word, if count &gt; 1.
+     */
+    @JvmStatic
+    fun plural(count: Long, word: String, plural: String): String {
+        return if (count > 1) {
+            plural
+        } else {
+            word
+        }
+    }
+
+    /**
+     * Makes the given string red.
+     */
+    @JvmStatic
+    fun red(s: String?): String = colorize(s, Colors.RED)
+
+    /**
+     * Makes the given string reverse color.
+     */
+    @JvmStatic
+    fun reverseColor(s: String?): String = colorize(s, Colors.REVERSE)
+
+    /**
+     * Returns today's date.
+     */
+    @JvmStatic
+    fun today(): String = isoLocalDate(LocalDateTime.now())
+
+    /**
+     * Converts XML/XHTML entities to plain text.
+     */
+    @JvmStatic
+    fun unescapeXml(str: String): String = Jsoup.parse(str).text()
+
+    /**
+     * Converts milliseconds to year month week day hour and minutes.
+     */
+    @JvmStatic
+    fun uptime(uptime: Long): String {
+        val info = StringBuilder()
+        var days = TimeUnit.MILLISECONDS.toDays(uptime)
+        val years = days / 365
+        days %= 365
+        val months = days / 30
+        days %= 30
+        val weeks = days / 7
+        days %= 7
+        val hours = TimeUnit.MILLISECONDS.toHours(uptime) - TimeUnit.DAYS.toHours(
+            TimeUnit.MILLISECONDS.toDays(uptime)
+        )
+        val minutes = TimeUnit.MILLISECONDS.toMinutes(uptime) - TimeUnit.HOURS.toMinutes(
+            TimeUnit.MILLISECONDS.toHours(uptime)
+        )
+        with(info) {
+            if (years > 0) {
+                append(years).append(plural(years, " year ", " years "))
+            }
+            if (months > 0) {
+                append(weeks).append(plural(months, " month ", " months "))
+            }
+            if (weeks > 0) {
+                append(weeks).append(plural(weeks, " week ", " weeks "))
+            }
+            if (days > 0) {
+                append(days).append(plural(days, " day ", " days "))
+            }
+            if (hours > 0) {
+                append(hours).append(plural(hours, " hour ", " hours "))
+            }
+            append(minutes).append(plural(minutes, " minute", " minutes"))
+            return toString()
+        }
+    }
+
+    /**
+     * Reads contents of a URL.
+     */
+    @JvmStatic
+    @Throws(IOException::class)
+    fun urlReader(url: URL): String {
+        BufferedReader(InputStreamReader(url.openStream(), StandardCharsets.UTF_8))
+            .use { reader -> return reader.lines().collect(Collectors.joining(System.lineSeparator())) }
+    }
+
+    /**
+     * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
+     */
+    @JvmStatic
+    fun utcDateTime(date: Date): String {
+        return utcDateTime(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()))
+    }
+
+    /**
+     * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
+     */
+    @JvmStatic
+    fun utcDateTime(date: LocalDateTime?): String {
+        return if (date != null) {
+            date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+        } else {
+            ""
+        }
+    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
new file mode 100644
index 0000000..9bf3630
--- /dev/null
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
@@ -0,0 +1,58 @@
+/*
+ * Debug.kt
+ *
+ * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.core.config.Configurator
+
+class Debug(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "debug"
+    override val help = emptyList<String>()
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = false
+
+    override fun commandResponse(sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean) {
+        if (isOp) {
+            with(bot) {
+                if (logger.isDebugEnabled) {
+                    Configurator.setLevel(logger.name, loggerLevel)
+                } else {
+                    Configurator.setLevel(logger.name, Level.DEBUG)
+                }
+                send(sender, "Debug logging is " + if (logger.isDebugEnabled) "enabled." else "disabled.", true)
+            }
+        }
+    }
+}
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index f79bb4c..be54085 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -32,13 +32,13 @@
 package net.thauvin.erik.mobibot.commands.tell
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.Companion.bold
-import net.thauvin.erik.mobibot.Utils.Companion.getIntProperty
-import net.thauvin.erik.mobibot.Utils.Companion.helpFormat
-import net.thauvin.erik.mobibot.Utils.Companion.helpIndent
-import net.thauvin.erik.mobibot.Utils.Companion.plural
-import net.thauvin.erik.mobibot.Utils.Companion.reverseColor
-import net.thauvin.erik.mobibot.Utils.Companion.utcDateTime
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.getIntProperty
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.helpIndent
+import net.thauvin.erik.mobibot.Utils.plural
+import net.thauvin.erik.mobibot.Utils.reverseColor
+import net.thauvin.erik.mobibot.Utils.utcDateTime
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.View
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
index f3907ec..7a7e927 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -42,7 +42,6 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.time.Clock
 import java.time.LocalDateTime
-import java.util.*
 
 /**
  * The Tell Messages Manager.
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index 54ba3e6..57702c9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -40,7 +40,7 @@ import com.rometools.rome.io.FeedException
 import com.rometools.rome.io.SyndFeedInput
 import com.rometools.rome.io.SyndFeedOutput
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.Companion.isoLocalDate
+import net.thauvin.erik.mobibot.Utils.isoLocalDate
 import java.io.IOException
 import java.io.InputStreamReader
 import java.io.OutputStreamWriter
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index a96bad0..d9ca531 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -32,52 +32,49 @@
 package net.thauvin.erik.mobibot.entries
 
 import net.thauvin.erik.mobibot.Constants
-import net.thauvin.erik.mobibot.Utils.Companion.bold
-import net.thauvin.erik.mobibot.Utils.Companion.green
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.green
 
 /**
- * The `Utils` class.
+ * Entries utilities.
  */
-class EntriesUtils private constructor() {
-    companion object {
-        /**
-         * Build link cmd based on its index. e.g: L1
-         */
-        fun buildLinkCmd(index: Int): String = Constants.LINK_CMD + (index + 1)
+object EntriesUtils {
+    /**
+     * Build link cmd based on its index. e.g: L1
+     */
+    fun buildLinkCmd(index: Int): String = Constants.LINK_CMD + (index + 1)
 
-        /**
-         * Builds an entry's comment for display on the channel.
-         */
-        fun buildComment(entryIndex: Int, commentIndex: Int, comment: EntryComment): String =
-            (buildLinkCmd(entryIndex) + '.' + (commentIndex + 1) + ": [" + comment.nick + "] "
-                + comment.comment)
+    /**
+     * Builds an entry's comment for display on the channel.
+     */
+    fun buildComment(entryIndex: Int, commentIndex: Int, comment: EntryComment): String =
+        ("${buildLinkCmd(entryIndex)}.${commentIndex + 1}: [${comment.nick}] ${comment.comment}")
 
-        /**
-         * Builds an entry's link for display on the channel.
-         */
-        @JvmOverloads
-        fun buildLink(entryIndex: Int, entry: EntryLink, isView: Boolean = false): String {
-            val buff = StringBuilder().append(buildLinkCmd(entryIndex)).append(": ")
-                .append('[').append(entry.nick).append(']')
-            if (isView && entry.hasComments()) {
-                buff.append("[+").append(entry.comments.size).append(']')
-            }
-            buff.append(' ')
-            with(entry) {
-                if (Constants.NO_TITLE == title) {
-                    buff.append(title)
-                } else {
-                    buff.append(bold(title))
-                }
-                buff.append(" ( ").append(green(link)).append(" )")
-            }
-            return buff.toString()
+    /**
+     * Builds an entry's link for display on the channel.
+     */
+    @JvmOverloads
+    fun buildLink(entryIndex: Int, entry: EntryLink, isView: Boolean = false): String {
+        val buff = StringBuilder().append(buildLinkCmd(entryIndex)).append(": ")
+            .append('[').append(entry.nick).append(']')
+        if (isView && entry.hasComments()) {
+            buff.append("[+").append(entry.comments.size).append(']')
         }
-
-        /**
-         * Build an entry's tags/categories for display on the channel.
-         */
-        fun buildTags(entryIndex: Int, entry: EntryLink): String =
-            buildLinkCmd(entryIndex) + "T: " + entry.pinboardTags.replace(",", ", ")
+        buff.append(' ')
+        with(entry) {
+            if (Constants.NO_TITLE == title) {
+                buff.append(title)
+            } else {
+                buff.append(bold(title))
+            }
+            buff.append(" ( ").append(green(link)).append(" )")
+        }
+        return buff.toString()
     }
+
+    /**
+     * Build an entry's tags/categories for display on the channel.
+     */
+    fun buildTags(entryIndex: Int, entry: EntryLink): String =
+        buildLinkCmd(entryIndex) + "T: " + entry.pinboardTags.replace(",", ", ")
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 9038a7a..d02e5d6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -72,7 +72,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 try {
                     loadRates()
                 } catch (e: ModuleException) {
-                    if (bot.logger.isWarnEnabled)logger.warn(e.debugMessage, e)
+                    if (bot.logger.isWarnEnabled) logger.warn(e.debugMessage, e)
                 }
             }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
index a6f66f7..9987bd8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
@@ -1,5 +1,5 @@
 /*
- * Message.java
+ * Message.kt
  *
  * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -41,19 +41,19 @@ open class Message {
         var DEFAULT_COLOR = Colors.NORMAL
     }
 
-    /** Color */
+    /** Message color. */
     var color = DEFAULT_COLOR
 
-    /** Error */
+    /** Error flag. */
     var isError = false
 
-    /** Notice */
+    /** Notice flag. */
     var isNotice = false
 
-    /** Private */
+    /** Private flag. */
     var isPrivate = false
 
-    /** Message text*/
+    /** Message text. */
     var msg = ""
 
     /** Creates a new message. */
diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java
deleted file mode 100644
index bde9d77..0000000
--- a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * UtilsTest.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot;
-
-import org.apache.commons.lang3.StringUtils;
-import org.jibble.pircbot.Colors;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.time.LocalDateTime;
-import java.util.Calendar;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * The <code>Utils Test</code> class.
- *
- * @author <a href="https://erik.thauvin.net/" target="_blank">Erik C. Thauvin</a>
- * @created 2017-05-30
- * @since 1.0
- */
-public class UtilsTest {
-    private static final String ASCII =
-            " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
-
-    private final Calendar cal = Calendar.getInstance();
-    private final LocalDateTime localDateTime = LocalDateTime.of(1952, 2, 17, 12, 30, 0);
-
-    @BeforeClass
-    public void setUp() {
-        cal.set(1952, Calendar.FEBRUARY, 17, 12, 30, 0);
-    }
-
-    @Test
-    public void testBold() {
-        assertThat(Utils.bold(Integer.toString(1))).as("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD);
-        assertThat(Utils.bold(ASCII)).as("bold(ascii").isEqualTo(Colors.BOLD + ASCII + Colors.BOLD);
-    }
-
-    @Test
-    public void testColorize() {
-        assertThat(Utils.colorize(ASCII, Colors.REVERSE)).as("colorize(reverse)").isEqualTo(
-                Colors.REVERSE + ASCII + Colors.REVERSE);
-        assertThat(Utils.colorize(ASCII, Colors.RED)).as("colorize(red)").isEqualTo(Colors.RED + ASCII + Colors.NORMAL);
-        assertThat(Utils.colorize(null, Colors.RED)).as("colorize(null)").isEqualTo(Colors.NORMAL);
-    }
-
-    @Test
-    public void testCyan() {
-        assertThat(Utils.cyan(ASCII)).isEqualTo(Colors.CYAN + ASCII + Colors.NORMAL);
-    }
-
-    @Test
-    public void testEnsureDir() {
-        assertThat(Utils.ensureDir("dir", false)).as("ensureDir(dir, false)").isEqualTo("dir" + File.separatorChar);
-        assertThat(Utils.ensureDir("https://erik.thauvin.net", true)).as("ensureDir(erik.thauvin.net, true)").isEqualTo(
-                "https://erik.thauvin.net/");
-    }
-
-    @Test
-    public void testGetIntProperty() {
-        assertThat(Utils.getIntProperty("10", 1)).as("getIntProperty(10, 1)").isEqualTo(10);
-        assertThat(Utils.getIntProperty("a", 1)).as("getIntProperty(a, 1)").isEqualTo(1);
-    }
-
-    @Test
-    public void testGreen() {
-        assertThat(Utils.green(ASCII)).isEqualTo(Colors.DARK_GREEN + ASCII + Colors.NORMAL);
-    }
-
-    @Test
-    public void testIsoLocalDate() {
-        assertThat(Utils.isoLocalDate(cal.getTime())).as("isoLocalDate(date)").isEqualTo("1952-02-17");
-        assertThat(Utils.isoLocalDate(localDateTime)).as("isoLocalDate(localDate)").isEqualTo("1952-02-17");
-    }
-
-    @Test
-    public void testObfuscate() {
-        assertThat(Utils.obfuscate(ASCII).length()).as("obfuscate is right length").isEqualTo(ASCII.length());
-        assertThat(Utils.obfuscate(ASCII)).as("obfuscate()").isEqualTo(StringUtils.repeat("x", ASCII.length()));
-        assertThat(Utils.obfuscate(" ")).as("obfuscate(blank)").isEqualTo(" ");
-    }
-
-    @Test
-    public void testPlural() {
-        final String week = "week";
-        final String weeks = "weeks";
-
-        assertThat(Utils.plural(-1, week, weeks)).as("plural(-1)").isEqualTo(week);
-        assertThat(Utils.plural(0, week, weeks)).as("plural(0)").isEqualTo(week);
-        assertThat(Utils.plural(1, week, weeks)).as("plural(1)").isEqualTo(week);
-        assertThat(Utils.plural(2, week, weeks)).as("plural(2)").isEqualTo(weeks);
-    }
-
-    @Test
-    public void testReverseColor() {
-        assertThat(Utils.reverseColor(ASCII)).isEqualTo(Colors.REVERSE + ASCII + Colors.REVERSE);
-    }
-
-    @Test
-    public void testToday() {
-        assertThat(Utils.today()).isEqualTo(Utils.isoLocalDate(LocalDateTime.now()));
-    }
-
-    @Test
-    public void testUnescapeXml() {
-        assertThat(Utils.unescapeXml("&lt;a name=&quot;test &amp; &apos;&#39;&quot;&gt;")).isEqualTo(
-                "<a name=\"test & ''\">");
-    }
-
-    @Test
-    public void testUptime() {
-        assertThat("17 years 2 months 2 weeks 1 day 6 hours 45 minutes").isEqualTo(Utils.uptime(547800300076L));
-    }
-
-    @Test
-    public void testUrlReader() throws IOException {
-        assertThat(Utils.urlReader(new URL("https://postman-echo.com/status/200"))).as("urlReader()").isEqualTo(
-                "{\"status\":200}");
-    }
-
-    @Test
-    public void testUtcDateTime() {
-        assertThat(Utils.utcDateTime(cal.getTime())).as("utcDateTime(date)").isEqualTo("1952-02-17 12:30");
-        assertThat(Utils.utcDateTime(localDateTime)).as("utcDateTime(localDate)").isEqualTo("1952-02-17 12:30");
-    }
-}
diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
new file mode 100644
index 0000000..6e2c269
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -0,0 +1,172 @@
+/*
+ * UtilsTest.java
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot
+
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.colorize
+import net.thauvin.erik.mobibot.Utils.cyan
+import net.thauvin.erik.mobibot.Utils.ensureDir
+import net.thauvin.erik.mobibot.Utils.getIntProperty
+import net.thauvin.erik.mobibot.Utils.green
+import net.thauvin.erik.mobibot.Utils.isoLocalDate
+import net.thauvin.erik.mobibot.Utils.obfuscate
+import net.thauvin.erik.mobibot.Utils.plural
+import net.thauvin.erik.mobibot.Utils.reverseColor
+import net.thauvin.erik.mobibot.Utils.today
+import net.thauvin.erik.mobibot.Utils.unescapeXml
+import net.thauvin.erik.mobibot.Utils.uptime
+import net.thauvin.erik.mobibot.Utils.urlReader
+import net.thauvin.erik.mobibot.Utils.utcDateTime
+import org.apache.commons.lang3.StringUtils
+import org.assertj.core.api.Assertions
+import org.jibble.pircbot.Colors
+import org.testng.annotations.BeforeClass
+import org.testng.annotations.Test
+import java.io.File
+import java.io.IOException
+import java.net.URL
+import java.time.LocalDateTime
+import java.util.*
+
+/**
+ * The `Utils Test` class.
+ */
+class UtilsTest {
+    private val ascii =
+        " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+    private val cal = Calendar.getInstance()
+    private val localDateTime = LocalDateTime.of(1952, 2, 17, 12, 30, 0)
+
+    @BeforeClass
+    fun setUp() {
+        cal[1952, Calendar.FEBRUARY, 17, 12, 30] = 0
+    }
+
+    @Test
+    fun testBold() {
+        Assertions.assertThat(bold(1.toString())).`as`("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
+        Assertions.assertThat(bold(ascii)).`as`("bold(ascii").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+    }
+
+    @Test
+    fun testColorize() {
+        Assertions.assertThat(colorize(ascii, Colors.REVERSE)).`as`("colorize(reverse)").isEqualTo(
+            Colors.REVERSE + ascii + Colors.REVERSE
+        )
+        Assertions.assertThat(colorize(ascii, Colors.RED)).`as`("colorize(red)")
+            .isEqualTo(Colors.RED + ascii + Colors.NORMAL)
+        Assertions.assertThat(colorize(null, Colors.RED)).`as`("colorize(null)").isEqualTo(Colors.NORMAL)
+    }
+
+    @Test
+    fun testCyan() {
+        Assertions.assertThat(cyan(ascii)).isEqualTo(Colors.CYAN + ascii + Colors.NORMAL)
+    }
+
+    @Test
+    fun testEnsureDir() {
+        Assertions.assertThat(ensureDir("dir", false)).`as`("ensureDir(dir, false)")
+            .isEqualTo("dir" + File.separatorChar)
+        Assertions.assertThat(ensureDir("https://erik.thauvin.net", true)).`as`("ensureDir(erik.thauvin.net, true)")
+            .isEqualTo("https://erik.thauvin.net/")
+    }
+
+    @Test
+    fun testGetIntProperty() {
+        Assertions.assertThat(getIntProperty("10", 1)).`as`("getIntProperty(10, 1)").isEqualTo(10)
+        Assertions.assertThat(getIntProperty("a", 1)).`as`("getIntProperty(a, 1)").isEqualTo(1)
+    }
+
+    @Test
+    fun testGreen() {
+        Assertions.assertThat(green(ascii)).isEqualTo(Colors.DARK_GREEN + ascii + Colors.NORMAL)
+    }
+
+    @Test
+    fun testIsoLocalDate() {
+        Assertions.assertThat(isoLocalDate(cal.time)).`as`("isoLocalDate(date)").isEqualTo("1952-02-17")
+        Assertions.assertThat(isoLocalDate(localDateTime)).`as`("isoLocalDate(localDate)").isEqualTo("1952-02-17")
+    }
+
+    @Test
+    fun testObfuscate() {
+        Assertions.assertThat(obfuscate(ascii).length).`as`("obfuscate is right length").isEqualTo(ascii.length)
+        Assertions.assertThat(obfuscate(ascii)).`as`("obfuscate()").isEqualTo(StringUtils.repeat("x", ascii.length))
+        Assertions.assertThat(obfuscate(" ")).`as`("obfuscate(blank)").isEqualTo(" ")
+    }
+
+    @Test
+    fun testPlural() {
+        val week = "week"
+        val weeks = "weeks"
+        Assertions.assertThat(plural(-1, week, weeks)).`as`("plural(-1)").isEqualTo(week)
+        Assertions.assertThat(plural(0, week, weeks)).`as`("plural(0)").isEqualTo(week)
+        Assertions.assertThat(plural(1, week, weeks)).`as`("plural(1)").isEqualTo(week)
+        Assertions.assertThat(plural(2, week, weeks)).`as`("plural(2)").isEqualTo(weeks)
+    }
+
+    @Test
+    fun testReverseColor() {
+        Assertions.assertThat(reverseColor(ascii)).isEqualTo(Colors.REVERSE + ascii + Colors.REVERSE)
+    }
+
+    @Test
+    fun testToday() {
+        Assertions.assertThat(today()).isEqualTo(isoLocalDate(LocalDateTime.now()))
+    }
+
+    @Test
+    fun testUnescapeXml() {
+        Assertions.assertThat(unescapeXml("&lt;a name=&quot;test &amp; &apos;&#39;&quot;&gt;")).isEqualTo(
+            "<a name=\"test & ''\">"
+        )
+    }
+
+    @Test
+    fun testUptime() {
+        Assertions.assertThat("17 years 2 months 2 weeks 1 day 6 hours 45 minutes").isEqualTo(uptime(547800300076L))
+    }
+
+    @Test
+    @Throws(IOException::class)
+    fun testUrlReader() {
+        Assertions.assertThat(urlReader(URL("https://postman-echo.com/status/200"))).`as`("urlReader()").isEqualTo(
+            "{\"status\":200}"
+        )
+    }
+
+    @Test
+    fun testUtcDateTime() {
+        Assertions.assertThat(utcDateTime(cal.time)).`as`("utcDateTime(date)").isEqualTo("1952-02-17 12:30")
+        Assertions.assertThat(utcDateTime(localDateTime)).`as`("utcDateTime(localDate)").isEqualTo("1952-02-17 12:30")
+    }
+}
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
index aad40e5..ed57c8e 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -35,7 +35,6 @@ import net.thauvin.erik.mobibot.modules.Lookup.Companion.lookup
 import net.thauvin.erik.mobibot.modules.Lookup.Companion.whois
 import org.assertj.core.api.Assertions
 import org.testng.annotations.Test
-import java.util.*
 
 /**
  * The `Lookup Test` class.

From b24c0ebe54d881cba45bbd545b37931e4befeecd Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 6 Dec 2020 16:02:47 -0800
Subject: [PATCH 107/262] Version 0.8.0-beta+361

---
 version.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version.properties b/version.properties
index 254cc73..0a176c6 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sun Dec 06 02:35:51 PST 2020
-version.buildmeta=350
+#Sun Dec 06 15:33:26 PST 2020
+version.buildmeta=361
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+350
+version.semver=0.8.0-beta+361

From f9edff48139b198ec7d21ac07736f798e1e071f9 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 7 Dec 2020 01:33:59 -0800
Subject: [PATCH 108/262] Added addons.exec() and addons.match() functions.
 Converted TellMessagesMgr and EntriesMgr to objects.

---
 .../java/net/thauvin/erik/mobibot/Addons.kt   |  33 ++
 .../java/net/thauvin/erik/mobibot/Mobibot.kt  |  72 +---
 .../mobibot/commands/tell/TellMessagesMgr.kt  |  78 ++--
 .../erik/mobibot/entries/EntriesMgr.kt        | 348 +++++++++---------
 4 files changed, 261 insertions(+), 270 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
index 1974aa4..04dfcd8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
@@ -87,6 +87,39 @@ class Addons {
         }
     }
 
+    /**
+     * Execute a command or module.
+     */
+    fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean {
+        for (command in commands) {
+            if (command.name.startsWith(cmd)) {
+                command.commandResponse(sender, login, args, isOp, isPrivate)
+                return true
+            }
+        }
+        for (module in modules) {
+            if ((isPrivate && module.isPrivateMsgEnabled) || !isPrivate) {
+                if (module.commands.contains(cmd)) {
+                    module.commandResponse(sender, cmd, args, isPrivate)
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+    /**
+     * Match a command.
+     */
+    fun match(sender: String, login: String, message: String, isOp: Boolean, isPrivate: Boolean) {
+        for (command in commands) {
+            if (command.matches(message)) {
+                command.commandResponse(sender, login, message, isOp, isPrivate)
+                break
+            }
+        }
+    }
+
     /**
      * Sort commands and modules names.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index e6c1f8b..16c28c0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -58,9 +58,6 @@ import net.thauvin.erik.mobibot.commands.Users
 import net.thauvin.erik.mobibot.commands.Versions
 import net.thauvin.erik.mobibot.commands.links.Comment
 import net.thauvin.erik.mobibot.commands.links.LinksMgr
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.saveEntries
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.startDate
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.startup
 import net.thauvin.erik.mobibot.commands.links.Posting
 import net.thauvin.erik.mobibot.commands.links.Tags
 import net.thauvin.erik.mobibot.commands.links.View
@@ -363,31 +360,12 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
             if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
                 helpResponse(sender, args, false)
             } else {
-                // Commands
-                for (command in addons.commands) {
-                    if (command.isPublic && command.name.startsWith(cmd)) {
-                        command.commandResponse(sender, login, args, isOp(sender), false)
-                        return
-                    }
-                }
-                // Modules
-                for (module in addons.modules) { // modules
-                    for (c in module.commands) {
-                        if (cmd.startsWith(c)) {
-                            module.commandResponse(sender, cmd, args, false)
-                            return
-                        }
-                    }
-                }
+                // Execute module or command
+                addons.exec(sender, login, cmd, args, isOp(sender), false)
             }
         } else {
-            // Commands, e.g.: https://www.example.com/
-            for (command in addons.commands) {
-                if (command.matches(message)) {
-                    command.commandResponse(sender, login, message, isOp(sender), false)
-                    return
-                }
-            }
+            // Links, e.g.: https://www.example.com/ or L1: , etc.
+            addons.match(sender, login, message, isOp(sender), false)
         }
         storeRecap(sender, message, false)
     }
@@ -420,23 +398,9 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
             quitServer("The Bot Is Out There!")
             exitProcess(0)
         } else {
-            for (command in addons.commands) {
-                if (command.name.startsWith(cmd)) {
-                    command.commandResponse(sender, login, args, isOp, true)
-                    return
-                }
+            if (!addons.exec(sender, login, cmd, args, isOp, true)) {
+                helpDefault(sender, isOp, true)
             }
-            for (module in addons.modules) {
-                if (module.isPrivateMsgEnabled) {
-                    for (c in module.commands) {
-                        if (cmd == c) {
-                            module.commandResponse(sender, cmd, args, true)
-                            return
-                        }
-                    }
-                }
-            }
-            helpDefault(sender, isOp, true)
         }
     }
 
@@ -600,16 +564,17 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                     HelpFormatter().printHelp(Mobibot::class.java.name, options)
                 }
                 commandLine.hasOption(Constants.VERSION_ARG[0]) -> {
+                    // Output the version
                     println("${ReleaseInfo.PROJECT} ${ReleaseInfo.VERSION} (${isoLocalDate(ReleaseInfo.BUILDDATE)})")
                     println(ReleaseInfo.WEBSITE)
                 }
                 else -> {
+                    // Load the properties
                     val p = Properties()
                     try {
                         Files.newInputStream(
                             Paths.get(commandLine.getOptionValue(Constants.PROPS_ARG[0], "./mobibot.properties"))
                         ).use { fis ->
-                            // Load the properties files
                             p.load(fis)
                         }
                     } catch (e: FileNotFoundException) {
@@ -625,7 +590,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                     val channel = p.getProperty("channel")
                     val logsDir = ensureDir(p.getProperty("logs", "."), false)
 
-                    // Redirect the stdout and stderr
+                    // Redirect stdout and stderr
                     if (!commandLine.hasOption(Constants.DEBUG_ARG[0])) {
                         try {
                             val stdout = PrintStream(
@@ -680,15 +645,6 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         // Store the default logger level
         loggerLevel = logger.level
 
-        // Load the current entries and backlogs, if any
-        try {
-            startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, this.channel)
-            if (logger.isDebugEnabled) logger.debug("Last feed: $startDate")
-        } catch (e: Exception) {
-            logger.error("An error occurred while loading the logs.", e)
-        }
-
-        // Initialize the bot
         setVerbose(true)
         setAutoNickChange(true)
         login = p.getProperty("login", name)
@@ -704,6 +660,14 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         weblogUrl = p.getProperty("weblog", "")
         backlogsUrl = ensureDir(p.getProperty("backlogs", weblogUrl), true)
 
+        // Load the current entries and backlogs, if any
+        try {
+            LinksMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, this.channel)
+            if (logger.isDebugEnabled) logger.debug("Last feed: ${LinksMgr.startDate}")
+        } catch (e: Exception) {
+            logger.error("An error occurred while loading the logs.", e)
+        }
+
         // Set the pinboard authentication
         setPinboardAuth(p.getProperty("pinboard-api-token", ""))
 
@@ -756,6 +720,6 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         addons.sort()
 
         // Save the entries
-        saveEntries(this, true)
+        LinksMgr.saveEntries(this, true)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
index 7a7e927..8bc0b18 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -46,53 +46,51 @@ import java.time.LocalDateTime
 /**
  * The Tell Messages Manager.
  */
-internal class TellMessagesMgr private constructor() {
-    companion object {
-        /**
-         * Cleans the messages queue.
-         */
-        fun clean(tellMessages: MutableList<TellMessage>, tellMaxDays: Int): Boolean {
-            val today = LocalDateTime.now(Clock.systemUTC())
-            return tellMessages.removeIf { o: TellMessage -> o.queued.plusDays(tellMaxDays.toLong()).isBefore(today) }
-        }
+internal object TellMessagesMgr {
+    /**
+     * Cleans the messages queue.
+     */
+    fun clean(tellMessages: MutableList<TellMessage>, tellMaxDays: Int): Boolean {
+        val today = LocalDateTime.now(Clock.systemUTC())
+        return tellMessages.removeIf { o: TellMessage -> o.queued.plusDays(tellMaxDays.toLong()).isBefore(today) }
+    }
 
-        /**
-         * Loads the messages.
-         */
+    /**
+     * Loads the messages.
+     */
 
-        fun load(file: String, logger: Logger): List<TellMessage> {
-            try {
-                ObjectInputStream(
-                    BufferedInputStream(Files.newInputStream(Paths.get(file)))
-                ).use { input ->
-                    if (logger.isDebugEnabled) logger.debug("Loading the messages.")
-                    @Suppress("UNCHECKED_CAST")
-                    return input.readObject() as List<TellMessage>
-                }
-            } catch (ignore: FileNotFoundException) {
-                // Do nothing
-            } catch (e: IOException) {
-                logger.error("An IO error occurred loading the messages queue.", e)
-            } catch (e: ClassNotFoundException) {
-                logger.error("An error occurred loading the messages queue.", e)
+    fun load(file: String, logger: Logger): List<TellMessage> {
+        try {
+            ObjectInputStream(
+                BufferedInputStream(Files.newInputStream(Paths.get(file)))
+            ).use { input ->
+                if (logger.isDebugEnabled) logger.debug("Loading the messages.")
+                @Suppress("UNCHECKED_CAST")
+                return input.readObject() as List<TellMessage>
             }
-            return listOf()
+        } catch (ignore: FileNotFoundException) {
+            // Do nothing
+        } catch (e: IOException) {
+            logger.error("An IO error occurred loading the messages queue.", e)
+        } catch (e: ClassNotFoundException) {
+            logger.error("An error occurred loading the messages queue.", e)
         }
+        return listOf()
+    }
 
-        /**
-         * Saves the messages.
-         */
-        fun save(file: String, messages: List<TellMessage?>?, logger: Logger) {
-            try {
-                BufferedOutputStream(Files.newOutputStream(Paths.get(file))).use { bos ->
-                    ObjectOutputStream(bos).use { output ->
-                        if (logger.isDebugEnabled) logger.debug("Saving the messages.")
-                        output.writeObject(messages)
-                    }
+    /**
+     * Saves the messages.
+     */
+    fun save(file: String, messages: List<TellMessage?>?, logger: Logger) {
+        try {
+            BufferedOutputStream(Files.newOutputStream(Paths.get(file))).use { bos ->
+                ObjectOutputStream(bos).use { output ->
+                    if (logger.isDebugEnabled) logger.debug("Saving the messages.")
+                    output.writeObject(messages)
                 }
-            } catch (e: IOException) {
-                logger.error("Unable to save messages queue.", e)
             }
+        } catch (e: IOException) {
+            logger.error("Unable to save messages queue.", e)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index 57702c9..823d2ab 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -52,203 +52,199 @@ import java.util.*
 /**
  * Manages the feed entries.
  */
-class EntriesMgr private constructor() {
+object EntriesMgr {
+    /**
+     * The name of the file containing the current entries.
+     */
+    const val CURRENT_XML = "current.xml"
 
+    /**
+     * The name of the file containing the backlog entries.
+     */
+    const val NAV_XML = "nav.xml"
 
-    companion object {
-        /**
-         * The name of the file containing the current entries.
-         */
-        const val CURRENT_XML = "current.xml"
+    /**
+     * The .xml extension
+     */
+    const val XML_EXT = ".xml"
 
-        /**
-         * The name of the file containing the backlog entries.
-         */
-        const val NAV_XML = "nav.xml"
+    // Maximum number of backlogs to keep
+    private const val maxBacklogs = 10
 
-        /**
-         * The .xml extension
-         */
-        const val XML_EXT = ".xml"
-
-        // Maximum number of backlogs to keep
-        private const val MAX_BACKLOGS = 10
-
-        /**
-         * Loads the backlogs.
-         */
-        @Throws(IOException::class, FeedException::class)
-        fun loadBacklogs(file: String, history: MutableList<String>) {
-            history.clear()
-            val input = SyndFeedInput()
-            InputStreamReader(Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8).use { reader ->
-                val feed = input.build(reader)
-                val items = feed.entries
-                for (i in items.indices.reversed()) {
-                    history.add(items[i].title)
-                }
+    /**
+     * Loads the backlogs.
+     */
+    @Throws(IOException::class, FeedException::class)
+    fun loadBacklogs(file: String, history: MutableList<String>) {
+        history.clear()
+        val input = SyndFeedInput()
+        InputStreamReader(Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8).use { reader ->
+            val feed = input.build(reader)
+            val items = feed.entries
+            for (i in items.indices.reversed()) {
+                history.add(items[i].title)
             }
         }
+    }
 
-        /**
-         * Loads the current entries.
-         */
-        @Throws(IOException::class, FeedException::class)
-        fun loadEntries(file: String, channel: String, entries: MutableList<EntryLink>): String {
-            entries.clear()
-            val input = SyndFeedInput()
-            var today: String
-            InputStreamReader(
-                Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8
-            ).use { reader ->
-                val feed = input.build(reader)
-                today = isoLocalDate(feed.publishedDate)
-                val items = feed.entries
-                var entry: EntryLink
-                for (i in items.indices.reversed()) {
-                    with(items[i]) {
-                        entry = EntryLink(
-                            link,
-                            title,
-                            author.substring(author.lastIndexOf('(') + 1, author.length - 1),
-                            channel,
-                            publishedDate,
-                            categories
-                        )
-                        var split: List<String>
-                        for (comment in description.value.split("<br/>")) {
-                            split = comment.split(": ".toRegex(), 2)
-                            if (split.size == 2) {
-                                entry.addComment(comment = split[1].trim(), nick = split[0].trim())
-                            }
+    /**
+     * Loads the current entries.
+     */
+    @Throws(IOException::class, FeedException::class)
+    fun loadEntries(file: String, channel: String, entries: MutableList<EntryLink>): String {
+        entries.clear()
+        val input = SyndFeedInput()
+        var today: String
+        InputStreamReader(
+            Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8
+        ).use { reader ->
+            val feed = input.build(reader)
+            today = isoLocalDate(feed.publishedDate)
+            val items = feed.entries
+            var entry: EntryLink
+            for (i in items.indices.reversed()) {
+                with(items[i]) {
+                    entry = EntryLink(
+                        link,
+                        title,
+                        author.substring(author.lastIndexOf('(') + 1, author.length - 1),
+                        channel,
+                        publishedDate,
+                        categories
+                    )
+                    var split: List<String>
+                    for (comment in description.value.split("<br/>")) {
+                        split = comment.split(": ".toRegex(), 2)
+                        if (split.size == 2) {
+                            entry.addComment(comment = split[1].trim(), nick = split[0].trim())
                         }
                     }
-                    entries.add(entry)
                 }
+                entries.add(entry)
             }
-            return today
         }
+        return today
+    }
 
-        /**
-         * Saves the entries.
-         */
-        fun saveEntries(
-            bot: Mobibot,
-            entries: List<EntryLink>,
-            history: MutableList<String>,
-            isDayBackup: Boolean
-        ) {
-            if (bot.logger.isDebugEnabled) bot.logger.debug("Saving the feeds...")
-            if (bot.logsDir.isNotBlank() && bot.weblogUrl.isNotBlank()) {
-                try {
-                    val output = SyndFeedOutput()
-                    var rss: SyndFeed = SyndFeedImpl()
-                    val items: MutableList<SyndEntry> = mutableListOf()
-                    var item: SyndEntry
-                    OutputStreamWriter(
-                        Files.newOutputStream(Paths.get(bot.logsDir + CURRENT_XML)), StandardCharsets.UTF_8
-                    ).use { fw ->
-                        rss.apply {
-                            feedType = "rss_2.0"
-                            title = bot.channel + " IRC Links"
-                            description = "Links from ${bot.ircServer} on ${bot.channel}"
-                            link = bot.weblogUrl
-                            publishedDate = Calendar.getInstance().time
-                            language = "en"
-                        }
-                        var buff: StringBuilder
-                        var comment: EntryComment
-                        for (i in entries.size - 1 downTo 0) {
-                            with(entries[i]) {
-                                buff = StringBuilder()
-                                    .append("Posted by <b>")
-                                    .append(nick)
-                                    .append("</b> on <a href=\"irc://")
-                                    .append(bot.ircServer).append('/')
-                                    .append(channel)
-                                    .append("\"><b>")
-                                    .append(channel)
-                                    .append("</b></a>")
-                                if (comments.size > 0) {
-                                    buff.append(" <br/><br/>")
-                                    val comments = comments
-                                    for (j in comments.indices) {
-                                        comment = comments[j]
-                                        if (j > 0) {
-                                            buff.append(" <br/>")
-                                        }
-                                        buff.append(comment.nick).append(": ").append(comment.comment)
+    /**
+     * Saves the entries.
+     */
+    fun saveEntries(
+        bot: Mobibot,
+        entries: List<EntryLink>,
+        history: MutableList<String>,
+        isDayBackup: Boolean
+    ) {
+        if (bot.logger.isDebugEnabled) bot.logger.debug("Saving the feeds...")
+        if (bot.logsDir.isNotBlank() && bot.weblogUrl.isNotBlank()) {
+            try {
+                val output = SyndFeedOutput()
+                var rss: SyndFeed = SyndFeedImpl()
+                val items: MutableList<SyndEntry> = mutableListOf()
+                var item: SyndEntry
+                OutputStreamWriter(
+                    Files.newOutputStream(Paths.get(bot.logsDir + CURRENT_XML)), StandardCharsets.UTF_8
+                ).use { fw ->
+                    rss.apply {
+                        feedType = "rss_2.0"
+                        title = bot.channel + " IRC Links"
+                        description = "Links from ${bot.ircServer} on ${bot.channel}"
+                        link = bot.weblogUrl
+                        publishedDate = Calendar.getInstance().time
+                        language = "en"
+                    }
+                    var buff: StringBuilder
+                    var comment: EntryComment
+                    for (i in entries.size - 1 downTo 0) {
+                        with(entries[i]) {
+                            buff = StringBuilder()
+                                .append("Posted by <b>")
+                                .append(nick)
+                                .append("</b> on <a href=\"irc://")
+                                .append(bot.ircServer).append('/')
+                                .append(channel)
+                                .append("\"><b>")
+                                .append(channel)
+                                .append("</b></a>")
+                            if (comments.size > 0) {
+                                buff.append(" <br/><br/>")
+                                val comments = comments
+                                for (j in comments.indices) {
+                                    comment = comments[j]
+                                    if (j > 0) {
+                                        buff.append(" <br/>")
                                     }
+                                    buff.append(comment.nick).append(": ").append(comment.comment)
                                 }
+                            }
+                            item = SyndEntryImpl()
+                            item.link = link
+                            item.description = SyndContentImpl().apply { value = buff.toString() }
+                            item.title = title
+                            item.publishedDate = date
+                            item.author = "${bot.channel.substring(1)}@${bot.ircServer} ($nick)"
+                            item.categories = tags
+                            items.add(item)
+                        }
+                    }
+                    rss.entries = items
+                    if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the entries feed.")
+                    output.output(rss, fw)
+                }
+                OutputStreamWriter(
+                    Files.newOutputStream(
+                        Paths.get(
+                            bot.logsDir + bot.today + XML_EXT
+                        )
+                    ), StandardCharsets.UTF_8
+                ).use { fw -> output.output(rss, fw) }
+                if (isDayBackup) {
+                    if (bot.backlogsUrl.isNotBlank()) {
+                        if (!history.contains(bot.today)) {
+                            history.add(bot.today)
+                            while (history.size > maxBacklogs) {
+                                history.removeAt(0)
+                            }
+                        }
+                        OutputStreamWriter(
+                            Files.newOutputStream(Paths.get(bot.logsDir + NAV_XML)), StandardCharsets.UTF_8
+                        ).use { fw ->
+                            rss = SyndFeedImpl()
+                            rss.apply {
+                                feedType = "rss_2.0"
+                                title = "${bot.channel} IRC Links Backlogs"
+                                description = "Backlogs of Links from ${bot.ircServer} on ${bot.channel}"
+                                link = bot.backlogsUrl
+                                publishedDate = Calendar.getInstance().time
+                            }
+                            var date: String
+                            items.clear()
+                            for (i in history.size - 1 downTo 0) {
+                                date = history[i]
                                 item = SyndEntryImpl()
-                                item.link = link
-                                item.description = SyndContentImpl().apply { value = buff.toString() }
-                                item.title = title
-                                item.publishedDate = date
-                                item.author = "${bot.channel.substring(1)}@${bot.ircServer} ($nick)"
-                                item.categories = tags
+                                item.apply {
+                                    link = bot.backlogsUrl + date + ".xml"
+                                    title = date
+                                    description = SyndContentImpl().apply { value = "Links for $date" }
+                                }
                                 items.add(item)
                             }
+                            rss.entries = items
+                            if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the backlog feed.")
+                            output.output(rss, fw)
                         }
-                        rss.entries = items
-                        if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the entries feed.")
-                        output.output(rss, fw)
+                    } else {
+                        bot.logger.warn("Unable to generate the backlogs feed. No property configured.")
                     }
-                    OutputStreamWriter(
-                        Files.newOutputStream(
-                            Paths.get(
-                                bot.logsDir + bot.today + XML_EXT
-                            )
-                        ), StandardCharsets.UTF_8
-                    ).use { fw -> output.output(rss, fw) }
-                    if (isDayBackup) {
-                        if (bot.backlogsUrl.isNotBlank()) {
-                            if (!history.contains(bot.today)) {
-                                history.add(bot.today)
-                                while (history.size > MAX_BACKLOGS) {
-                                    history.removeAt(0)
-                                }
-                            }
-                            OutputStreamWriter(
-                                Files.newOutputStream(Paths.get(bot.logsDir + NAV_XML)), StandardCharsets.UTF_8
-                            ).use { fw ->
-                                rss = SyndFeedImpl()
-                                rss.apply {
-                                    feedType = "rss_2.0"
-                                    title = "${bot.channel} IRC Links Backlogs"
-                                    description = "Backlogs of Links from ${bot.ircServer} on ${bot.channel}"
-                                    link = bot.backlogsUrl
-                                    publishedDate = Calendar.getInstance().time
-                                }
-                                var date: String
-                                items.clear()
-                                for (i in history.size - 1 downTo 0) {
-                                    date = history[i]
-                                    item = SyndEntryImpl()
-                                    item.apply {
-                                        link = bot.backlogsUrl + date + ".xml"
-                                        title = date
-                                        description = SyndContentImpl().apply { value = "Links for $date" }
-                                    }
-                                    items.add(item)
-                                }
-                                rss.entries = items
-                                if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the backlog feed.")
-                                output.output(rss, fw)
-                            }
-                        } else {
-                            bot.logger.warn("Unable to generate the backlogs feed. No property configured.")
-                        }
-                    }
-                } catch (e: FeedException) {
-                    if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
-                } catch (e: IOException) {
-                    if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
-                }
-            } else {
-                if (bot.logger.isWarnEnabled) {
-                    bot.logger.warn("Unable to generate the entries feed. A required property is missing.")
                 }
+            } catch (e: FeedException) {
+                if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
+            } catch (e: IOException) {
+                if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
+            }
+        } else {
+            if (bot.logger.isWarnEnabled) {
+                bot.logger.warn("Unable to generate the entries feed. A required property is missing.")
             }
         }
     }

From a0530a8dc2e8b6befd6e1d87bd3c361cc9f7be6b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 7 Dec 2020 01:34:11 -0800
Subject: [PATCH 109/262] Cleanup.

---
 config/detekt/baseline.xml                      | 17 ++++++++---------
 .../java/net/thauvin/erik/mobibot/FeedReader.kt | 10 ++++------
 .../erik/mobibot/commands/links/LinksMgr.kt     | 16 ----------------
 .../java/net/thauvin/erik/mobibot/UtilsTest.kt  |  4 ++--
 4 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index dc51202..ac048e7 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -2,13 +2,13 @@
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
-    <ID>ComplexMethod:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
+    <ID>ComplexMethod:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
     <ID>ComplexMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
-    <ID>EmptyDefaultConstructor:Message.kt$Message$()</ID>
-    <ID>LongMethod:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
+    <ID>LongMethod:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
     <ID>LongMethod:Mobibot.kt$Mobibot.Companion$ @JvmStatic fun main(args: Array&lt;String&gt;)</ID>
     <ID>LongMethod:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>LongParameterList:Addons.kt$Addons$(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean)</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
@@ -22,6 +22,7 @@
     <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$8</ID>
     <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
     <ID>MagicNumber:Dice.kt$Dice$7</ID>
+    <ID>MagicNumber:FeedReader.kt$FeedReader$5</ID>
     <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
     <ID>MagicNumber:Mobibot.kt$Mobibot$10</ID>
     <ID>MagicNumber:Mobibot.kt$Mobibot$1000L</ID>
@@ -56,25 +57,23 @@
     <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)</ID>
     <ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
-    <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ @Throws(IOException::class, FeedException::class) fun loadEntries(file: String, channel: String, entries: MutableList&lt;EntryLink&gt;): String</ID>
-    <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr.Companion$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</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>
     <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ private fun setTags(tags: List&lt;String?&gt;)</ID>
     <ID>NestedBlockDepth:FeedReader.kt$FeedReader$ override fun run()</ID>
     <ID>NestedBlockDepth:GoogleSearch.kt$GoogleSearch$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
     <ID>NestedBlockDepth:Lookup.kt$Lookup$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>NestedBlockDepth:Mobibot.kt$Mobibot$ fun connect()</ID>
-    <ID>NestedBlockDepth:Mobibot.kt$Mobibot$override fun onMessage( channel: String, sender: String, login: String, hostname: String, message: String )</ID>
-    <ID>NestedBlockDepth:Mobibot.kt$Mobibot$override fun onPrivateMessage( sender: String, login: String, hostname: String, message: String )</ID>
     <ID>NestedBlockDepth:StockQuote.kt$StockQuote$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:Tell.kt$Tell$ @JvmOverloads fun send(nickname: String, isMessage: Boolean = false)</ID>
     <ID>NestedBlockDepth:Tell.kt$Tell$// Delete message. private fun deleteMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean)</ID>
-    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr.Companion$ fun save(file: String, messages: List&lt;TellMessage?&gt;?, logger: Logger)</ID>
+    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ fun save(file: String, messages: List&lt;TellMessage?&gt;?, logger: Logger)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
-    <ID>ReturnCount:Mobibot.kt$Mobibot$override fun onMessage( channel: String, sender: String, login: String, hostname: String, message: String )</ID>
+    <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
index a3f6247..d57d1b4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
@@ -47,6 +47,9 @@ class FeedReader(
     // URL to fetch
     private val url: String
 ) : Runnable {
+    // Maximum number of feed items to display
+    private val maxItems = 5
+
     /**
      * Fetches the Feed's items.
      */
@@ -61,7 +64,7 @@ class FeedReader(
                         send(sender, "There is currently nothing to view.", false)
                     } else {
                         var i = 0
-                        while (i < items.size && i < MAX_ITEMS) {
+                        while (i < items.size && i < maxItems) {
                             send(sender, items[i].title, false)
                             send(sender, Utils.helpIndent(Utils.green(items[i].link), false), false)
                             i++
@@ -77,9 +80,4 @@ class FeedReader(
             }
         }
     }
-
-    companion object {
-        // Maximum number of feed items to display
-        private const val MAX_ITEMS = 5
-    }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index f246760..a3a3861 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -71,16 +71,10 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         @JvmField
         val history = mutableListOf<String>()
 
-
         @JvmStatic
         var startDate: String = Utils.today()
             private set
 
-        //        @JvmStatic
-        //        fun addHistory(index: Int, entry: String) {
-        //            history.add(index, entry)
-        //        }
-
         /**
          * Saves the entries.
          *
@@ -91,16 +85,6 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
             EntriesMgr.saveEntries(bot, entries, history, isDayBackup)
         }
 
-        //        @JvmStatic
-        //        fun removeEntry(index: Int) {
-        //            entries.removeAt(index)
-        //        }
-        //
-        //        @JvmStatic
-        //        fun getEntry(index: Int): EntryLink {
-        //            return entries[index]
-        //        }
-
         @JvmStatic
         fun startup(current: String, backlogs: String, channel: String) {
             startDate = EntriesMgr.loadEntries(current, channel, entries)
diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
index 6e2c269..fbe1ffb 100644
--- a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -73,8 +73,8 @@ class UtilsTest {
 
     @Test
     fun testBold() {
-        Assertions.assertThat(bold(1.toString())).`as`("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
-        Assertions.assertThat(bold(ascii)).`as`("bold(ascii").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+        Assertions.assertThat(bold(1)).`as`("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
+        Assertions.assertThat(bold(ascii)).`as`("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
     }
 
     @Test

From d5634d7418dfb6730374ee73c29a7631fc46390e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 7 Dec 2020 01:34:32 -0800
Subject: [PATCH 110/262] Version 0.8.0-beta+372

---
 version.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version.properties b/version.properties
index 0a176c6..8dcbee4 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sun Dec 06 15:33:26 PST 2020
-version.buildmeta=361
+#Mon Dec 07 01:27:15 PST 2020
+version.buildmeta=372
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+361
+version.semver=0.8.0-beta+372

From 7146bfcc60badadaa157e308e88e29d4fa873cb5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 8 Dec 2020 01:34:02 -0800
Subject: [PATCH 111/262] Improved helpFormat()

---
 .../java/net/thauvin/erik/mobibot/FeedReader.kt  |  2 +-
 .../java/net/thauvin/erik/mobibot/Mobibot.kt     | 11 +++++------
 src/main/java/net/thauvin/erik/mobibot/Utils.kt  | 16 +++-------------
 .../net/thauvin/erik/mobibot/commands/Cycle.kt   |  2 +-
 .../net/thauvin/erik/mobibot/commands/Ignore.kt  | 12 ++++++------
 .../net/thauvin/erik/mobibot/commands/Info.java  |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Me.kt |  2 +-
 .../net/thauvin/erik/mobibot/commands/Modules.kt |  2 +-
 .../net/thauvin/erik/mobibot/commands/Msg.kt     |  2 +-
 .../net/thauvin/erik/mobibot/commands/Nick.kt    |  2 +-
 .../net/thauvin/erik/mobibot/commands/Recap.kt   |  2 +-
 .../net/thauvin/erik/mobibot/commands/Say.kt     |  2 +-
 .../net/thauvin/erik/mobibot/commands/Users.kt   |  2 +-
 .../thauvin/erik/mobibot/commands/Versions.java  |  2 +-
 .../erik/mobibot/commands/links/Comment.kt       |  8 ++++----
 .../erik/mobibot/commands/links/LinksMgr.kt      |  2 +-
 .../erik/mobibot/commands/links/Posting.kt       |  8 ++++----
 .../thauvin/erik/mobibot/commands/links/Tags.kt  |  2 +-
 .../thauvin/erik/mobibot/commands/links/View.kt  |  2 +-
 .../thauvin/erik/mobibot/commands/tell/Tell.kt   | 10 +++++-----
 .../erik/mobibot/modules/CurrencyConverter.kt    |  8 ++++----
 .../net/thauvin/erik/mobibot/modules/Dice.kt     |  2 +-
 .../thauvin/erik/mobibot/modules/GoogleSearch.kt |  4 ++--
 .../net/thauvin/erik/mobibot/modules/Joke.kt     |  2 +-
 .../net/thauvin/erik/mobibot/modules/Lookup.kt   |  2 +-
 .../net/thauvin/erik/mobibot/modules/Ping.kt     |  2 +-
 .../erik/mobibot/modules/RockPaperScissors.kt    |  2 +-
 .../thauvin/erik/mobibot/modules/StockQuote.kt   |  2 +-
 .../net/thauvin/erik/mobibot/modules/Twitter.kt  |  2 +-
 .../net/thauvin/erik/mobibot/modules/War.java    |  2 +-
 .../net/thauvin/erik/mobibot/modules/Weather2.kt |  4 ++--
 .../thauvin/erik/mobibot/modules/WorldTime.kt    |  4 ++--
 32 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
index d57d1b4..23b124a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
@@ -66,7 +66,7 @@ class FeedReader(
                         var i = 0
                         while (i < items.size && i < maxItems) {
                             send(sender, items[i].title, false)
-                            send(sender, Utils.helpIndent(Utils.green(items[i].link), false), false)
+                            send(sender, Utils.helpFormat(Utils.green(items[i].link), false), false)
                             i++
                         }
                     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index 16c28c0..1900992 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -38,7 +38,7 @@ import net.thauvin.erik.mobibot.Utils.colorize
 import net.thauvin.erik.mobibot.Utils.ensureDir
 import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.Utils.helpIndent
+import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.isoLocalDate
 import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.commands.AddLog
@@ -254,7 +254,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         send(sender, "For more information on a specific command, type:", isPrivate)
         send(
             sender,
-            helpIndent(helpFormat("%c ${Constants.HELP_CMD} <command>", nick, isPrivate)),
+            helpFormat(buildCmdSyntax("%c ${Constants.HELP_CMD} <command>", nick, isPrivate)),
             isPrivate
         )
         send(sender, "The commands are:", isPrivate)
@@ -468,11 +468,10 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         while (i < list.size) {
             send(
                 nick,
-                helpIndent(
+                helpFormat(
                     list.subList(i, list.size.coerceAtMost(i + maxPerLine)).joinToString(" ", truncated = ""),
-                    isBold
-                ),
-                isPrivate
+                    isBold,
+                    isIndent        isPrivate
             )
             i += maxPerLine
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index 1aa1829..b4b91f6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -138,22 +138,12 @@ object Utils {
     fun green(s: String?): String = colorize(s, Colors.DARK_GREEN)
 
     /**
-     * Formats a help command by replacing `%c` with the bot's pub/priv command, and `%n` with the bot's
-     * nick.
-     */
-    @JvmStatic
-    fun helpFormat(text: String, botNick: String, isPrivate: Boolean): String {
-        val replace = arrayOf(if (isPrivate) "/msg $botNick" else "$botNick:", botNick)
-        return StringUtils.replaceEach(text, searchFlags, replace)
-    }
-
-    /**
-     * Returns indented help string.
+     * Returns a formatted help string.
      */
     @JvmStatic
     @JvmOverloads
-    fun helpIndent(help: String, isBold: Boolean = true): String {
-        return "      " + if (isBold) bold(help) else help
+    fun helpFormat(help: String, isBold: Boolean = true, isIndent: Boolean = true): String {
+        return (if (isIndent) "      " else "").plus(if (isBold) bold(help) else help)
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
index 525ad33..49832f2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -38,7 +38,7 @@ import net.thauvin.erik.mobibot.Utils
 class Cycle(bot: Mobibot) : AbstractCommand(bot) {
     private val wait = 10
     override val name = "cycle"
-    override val help = listOf("To have the bot leave the channel and come back:", Utils.helpIndent("%c $name"))
+    override val help = listOf("To have the bot leave the channel and come back:", Utils.helpFormat("%c $name"))
     override val isOp = true
     override val isPublic = false
     override val isVisible = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index de8d58b..10f8fe6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -47,17 +47,17 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
     override val name = IGNORE_CMD
     override val help = listOf(
         "To ignore a link posted to the channel:",
-        Utils.helpIndent("https://www.foo.bar %n"),
+        Utils.helpFormat("https://www.foo.bar %n"),
         "To check your ignore status:",
-        Utils.helpIndent("%c $name"),
+        Utils.helpFormat("%c $name"),
         "To toggle your ignore status:",
-        Utils.helpIndent("%c $name $me")
+        Utils.helpFormat("%c $name $me")
     )
     private val helpOp = listOf(
         "To ignore a link posted to the channel:",
-        Utils.helpIndent("https://www.foo.bar " + Utils.bold("%n"), false),
+        Utils.helpFormat("https://www.foo.bar " + Utils.bold("%n"), false),
         "To add/remove nicks from the ignored list:",
-        Utils.helpIndent("%c $name <nick> [<nick> ...]")
+        Utils.helpFormat("%c $name <nick> [<nick> ...]")
     )
 
     override val isOp = false
@@ -99,7 +99,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
     ): Boolean {
         return if (isOp) {
             for (h in helpOp) {
-                bot.send(sender, Utils.helpFormat(h, bot.nick, isPrivate), isPrivate)
+                bot.send(sender, Utils.buildCmdSyntax(h, bot.nick, isPrivate), isPrivate)
             }
             true
         } else {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index e9c9975..d16bd92 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -61,7 +61,7 @@ public class Info extends AbstractCommand {
     @NotNull
     @Override
     public List<String> getHelp() {
-        return List.of("To view information about the bot:", Utils.helpIndent("%c " + getName()));
+        return List.of("To view information about the bot:", Utils.helpFormat("%c " + getName()));
     }
 
     @Override
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
index 4b27cd7..fa0861b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
@@ -39,7 +39,7 @@ class Me(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "me"
     override val help = listOf(
         "To have the bot perform an action:",
-        Utils.helpIndent("%c $name <action>")
+        Utils.helpFormat("%c $name <action>")
     )
     override val isOp = true
     override val isPublic = false
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index 447552c..f3f3960 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -39,7 +39,7 @@ class Modules(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "modules"
     override val help = listOf(
         "To view a list of enabled modules:",
-        Utils.helpIndent("%c $name")
+        Utils.helpFormat("%c $name")
     )
     override val isOp = true
     override val isPublic = false
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
index 37c50df..31693c6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -39,7 +39,7 @@ class Msg(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "msg"
     override val help = listOf(
         "To have the bot send a private message to someone:",
-        Utils.helpIndent("%c $name <nick> <text>")
+        Utils.helpFormat("%c $name <nick> <text>")
     )
     override val isOp = true
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
index 6d12d2f..c6c7d2c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -39,7 +39,7 @@ class Nick(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "nick"
     override val help = listOf(
         "To change the bot's nickname:",
-        Utils.helpIndent("%c $name <nick>")
+        Utils.helpFormat("%c $name <nick>")
     )
     override val isOp = true
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
index e6341f8..57477ef 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -41,7 +41,7 @@ class Recap(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "recap"
     override val help = listOf(
         "To list the last 10 public channel messages:",
-        Utils.helpIndent("%c $name")
+        Utils.helpFormat("%c $name")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
index be8d6f0..7651d9d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
@@ -39,7 +39,7 @@ class Say(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "say"
     override val help = listOf(
         "To have the bot say something on the channel:",
-        Utils.helpIndent("%c $name <text>")
+        Utils.helpFormat("%c $name <text>")
     )
     override val isOp = true
     override val isPublic = false
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index 0315560..5afdf5a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -40,7 +40,7 @@ class Users(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "users"
     override val help = listOf(
         "To list the users present on the channel:",
-        Utils.helpIndent("%c $name")
+        Utils.helpFormat("%c $name")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 4b08631..8a2f168 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -61,7 +61,7 @@ public class Versions extends AbstractCommand {
     @NotNull
     @Override
     public List<String> getHelp() {
-        return List.of("To view the versions data (bot, platform, java, etc.):", Utils.helpIndent("%c " + getName()));
+        return List.of("To view the versions data (bot, platform, java, etc.):", Utils.helpFormat("%c " + getName()));
     }
 
     @Override
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 65941cf..35b644c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -43,12 +43,12 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
     override val name = COMMAND
     override val help = listOf(
         "To add a comment:",
-        Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
+        Utils.helpFormat("${Constants.LINK_CMD}1:This is a comment"),
         "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
         "To edit a comment, use its label: ",
-        Utils.helpIndent("${Constants.LINK_CMD}1.1:This is an edited comment"),
+        Utils.helpFormat("${Constants.LINK_CMD}1.1:This is an edited comment"),
         "To delete a comment, use its label and a minus sign: ",
-        Utils.helpIndent("${Constants.LINK_CMD}1.1:-")
+        Utils.helpFormat("${Constants.LINK_CMD}1.1:-")
     )
     override val isOp = false
     override val isPublic = true
@@ -98,7 +98,7 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
                 bot.send(sender, "To change a comment's author:", isPrivate)
                 bot.send(
                     sender,
-                    Utils.helpIndent("${Constants.LINK_CMD}1.1:?<nick>"),
+                    Utils.helpFormat("${Constants.LINK_CMD}1.1:?<nick>"),
                     isPrivate
                 )
             }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index a3a3861..374b9d5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -144,7 +144,7 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
                     bot.send(sender, "Please specify a title, by typing:", isPrivate)
                     bot.send(
                         sender,
-                        Utils.helpIndent("${EntriesUtils.buildLinkCmd(index)}:|This is the title"),
+                        Utils.helpFormat("${EntriesUtils.buildLinkCmd(index)}:|This is the title"),
                         isPrivate
                     )
                 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 474108f..5582fbb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -44,15 +44,15 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "posting"
     override val help = listOf(
         "Post a URL, by saying it on a line on its own:",
-        Utils.helpIndent("<url> [<title>] ${Tags.COMMAND}: <+tag> [...]]"),
+        Utils.helpFormat("<url> [<title>] ${Tags.COMMAND}: <+tag> [...]]"),
         "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1",
         "To add a title, use its label and a pipe:",
-        Utils.helpIndent("${Constants.LINK_CMD}1:|This is the title"),
+        Utils.helpFormat("${Constants.LINK_CMD}1:|This is the title"),
         "To add a comment:",
-        Utils.helpIndent("${Constants.LINK_CMD}1:This is a comment"),
+        Utils.helpFormat("${Constants.LINK_CMD}1:This is a comment"),
         "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
         "To edit a comment, see: ",
-        Utils.helpIndent("%c ${Constants.HELP_CMD} ${Comment.COMMAND}")
+        Utils.helpFormat("%c ${Constants.HELP_CMD} ${Comment.COMMAND}")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
index 9a9a73e..e07fe21 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -43,7 +43,7 @@ class Tags(bot: Mobibot) : AbstractCommand(bot) {
     override val name = COMMAND
     override val help = listOf(
         "To categorize or tag a URL, use its label and a T:",
-        Utils.helpIndent("${Constants.LINK_CMD}1T:<+tag|-tag> [...]")
+        Utils.helpFormat("${Constants.LINK_CMD}1T:<+tag|-tag> [...]")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index dbafa4a..0ea0708 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -44,7 +44,7 @@ class View(bot: Mobibot) : AbstractCommand(bot) {
     override val name = VIEW_CMD
     override val help = listOf(
         "To list or search the current URL posts:",
-        Utils.helpIndent("%c $name [<start>] [<query>]")
+        Utils.helpFormat("%c $name [<start>] [<query>]")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index be54085..af6a603 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -118,9 +118,9 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
     override val help: List<String>
         get() = listOf(
             "To send a message to someone when they join the channel:",
-            helpIndent("%c $name <nick> <message>"),
+            helpFormat("%c $name <nick> <message>"),
             "To view queued and sent messages:",
-            helpIndent("%c $name ${View.VIEW_CMD}"),
+            helpFormat("%c $name ${View.VIEW_CMD}"),
             "Messages are kept for " + bold(maxDays)
                 + plural(maxDays.toLong(), " day.", " days.")
         )
@@ -293,7 +293,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                         isPrivate
                     )
                 }
-                bot.send(sender, helpIndent(message.message), isPrivate)
+                bot.send(sender, helpFormat(message.message), isPrivate)
             }
         }
         if (!hasMessage) {
@@ -302,8 +302,8 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
             bot.send(sender, "To delete one or all delivered messages:", isPrivate)
             bot.send(
                 sender,
-                helpIndent(
-                    helpFormat(
+                helpFormat(
+                    buildCmdSyntax(
                         "%c $name $TELL_DEL_KEYWORD <id|$TELL_ALL_KEYWORD>",
                         bot.nick,
                         isPrivate
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index d02e5d6..ded4a6b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -108,16 +108,16 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 send(sender, "To convert from one currency to another:", isPrivate)
                 send(
                     sender,
-                    Utils.helpIndent(
-                        Utils.helpFormat("%c $CURRENCY_CMD 100 USD to EUR", nick, isPrivateMsgEnabled)
+                    Utils.helpFormat(
+                        Utils.buildCmdSyntax("%c $CURRENCY_CMD 100 USD to EUR", nick, isPrivateMsgEnabled)
                     ),
                     isPrivate
                 )
                 send(sender, "For a listing of current rates:", isPrivate)
                 send(
                     sender,
-                    Utils.helpIndent(
-                        Utils.helpFormat("%c $CURRENCY_CMD $CURRENCY_RATES_KEYWORD", nick, isPrivateMsgEnabled)
+                    Utils.helpFormat(
+                        Utils.buildCmdSyntax("%c $CURRENCY_CMD $CURRENCY_RATES_KEYWORD", nick, isPrivateMsgEnabled)
                     ),
                     isPrivate
                 )
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
index 4f6a314..fb20e9d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -98,6 +98,6 @@ class Dice(bot: Mobibot) : AbstractModule(bot) {
     init {
         commands.add(DICE_CMD)
         help.add("To roll the dice:")
-        help.add(Utils.helpIndent("%c $DICE_CMD"))
+        help.add(Utils.helpFormat("%c $DICE_CMD"))
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index 687ce17..bbaec32 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -101,7 +101,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
                     for (i in 0 until ja.length()) {
                         val j = ja.getJSONObject(i)
                         results.add(NoticeMessage(Utils.unescapeXml(j.getString("title"))))
-                        results.add(NoticeMessage(Utils.helpIndent(j.getString("link"), false), Colors.DARK_GREEN))
+                        results.add(NoticeMessage(Utils.helpFormat(j.getString("link"), false), Colors.DARK_GREEN))
                     }
                 } catch (e: IOException) {
                     throw ModuleException("searchGoogle($query)", "An IO error has occurred searching Google.", e)
@@ -118,7 +118,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(GOOGLE_CMD)
         help.add("To search Google:")
-        help.add(Utils.helpIndent("%c $GOOGLE_CMD <query>"))
+        help.add(Utils.helpFormat("%c $GOOGLE_CMD <query>"))
         initProperties(GOOGLE_API_KEY_PROP, GOOGLE_CSE_KEY_PROP)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
index bc760b2..9743441 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -97,6 +97,6 @@ class Joke(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(JOKE_CMD)
         help.add("To retrieve a random joke:")
-        help.add(Utils.helpIndent("%c $JOKE_CMD"))
+        help.add(Utils.helpFormat("%c $JOKE_CMD"))
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
index 32557bd..71a3037 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -164,6 +164,6 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
     init {
         commands.add(LOOKUP_CMD)
         help.add("To perform a DNS lookup query:")
-        help.add(Utils.helpIndent("%c $LOOKUP_CMD <ip address or hostname>"))
+        help.add(Utils.helpFormat("%c $LOOKUP_CMD <ip address or hostname>"))
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
index 980ece9..470a453 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
@@ -85,6 +85,6 @@ class Ping(bot: Mobibot) : AbstractModule(bot) {
     init {
         commands.add(PING_CMD)
         help.add("To ping the bot:")
-        help.add(Utils.helpIndent("%c $PING_CMD"))
+        help.add(Utils.helpFormat("%c $PING_CMD"))
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 9bcc1ad..e22496a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -51,7 +51,7 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
         with(help) {
             add("To play Rock Paper Scissors:")
             add(
-                Utils.helpIndent(
+                Utils.helpFormat(
                     "%c ${Hands.ROCK.name.toLowerCase()} | ${Hands.PAPER.name.toLowerCase()}"
                         + " | ${Hands.SCISSORS.name.toLowerCase()}"
                 )
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 5e4ae34..a43eca2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -206,7 +206,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(STOCK_CMD)
         help.add("To retrieve a stock quote:")
-        help.add(Utils.helpIndent("%c $STOCK_CMD <symbol|keywords>"))
+        help.add(Utils.helpFormat("%c $STOCK_CMD <symbol|keywords>"))
         initProperties(ALPHAVANTAGE_API_KEY_PROP)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
index 9a7ac28..beb3793 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -234,7 +234,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(TWITTER_CMD)
         help.add("To post to Twitter:")
-        help.add(Utils.helpIndent("%c $TWITTER_CMD <message>"))
+        help.add(Utils.helpFormat("%c $TWITTER_CMD <message>"))
         properties[AUTOPOST_PROP] = "false"
         initProperties(CONSUMER_KEY_PROP, CONSUMER_SECRET_PROP, HANDLE_PROP, TOKEN_PROP, TOKEN_SECRET_PROP)
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index fe43ef5..b239e87 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -65,7 +65,7 @@ public final class War extends AbstractModule {
         commands.add(WAR_CMD);
 
         help.add("To play war:");
-        help.add(Utils.helpIndent("%c " + WAR_CMD));
+        help.add(Utils.helpFormat("%c " + WAR_CMD));
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index ab2e385..a6133b4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -191,9 +191,9 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(WEATHER_CMD)
         help.add("To display weather information:")
-        help.add(Utils.helpIndent("%c $WEATHER_CMD <city> [, <country code>]"))
+        help.add(Utils.helpFormat("%c $WEATHER_CMD <city> [, <country code>]"))
         help.add("For example:")
-        help.add(Utils.helpIndent("%c $WEATHER_CMD paris, fr"))
+        help.add(Utils.helpFormat("%c $WEATHER_CMD paris, fr"))
         help.add("The default ISO 3166 country code is ${Utils.bold("US")}. Zip codes supported in most countries.")
         initProperties(OWM_API_KEY_PROP)
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 3338439..7695b0b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -211,9 +211,9 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
 
     init {
         help.add("To display a country's current date/time:")
-        help.add(Utils.helpIndent("%c $TIME_CMD") + " [<country code>]")
+        help.add(Utils.helpFormat("%c $TIME_CMD") + " [<country code>]")
         help.add("For a listing of the supported countries:")
-        help.add(Utils.helpIndent("%c $TIME_CMD"))
+        help.add(Utils.helpFormat("%c $TIME_CMD"))
         commands.add(TIME_CMD)
     }
 }

From e01de36909f70512c6ad9e71ebe76e1983b42f33 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 8 Dec 2020 01:39:19 -0800
Subject: [PATCH 112/262] Improved sendList()

---
 src/main/java/net/thauvin/erik/mobibot/Mobibot.kt      | 10 ++++------
 .../thauvin/erik/mobibot/commands/AbstractCommand.kt   |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/AddLog.kt   |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Ignore.kt   |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Info.java   |  4 +---
 .../java/net/thauvin/erik/mobibot/commands/Modules.kt  |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Users.kt    |  2 +-
 .../net/thauvin/erik/mobibot/commands/Versions.java    |  6 ++----
 .../net/thauvin/erik/mobibot/modules/AbstractModule.kt |  2 +-
 .../thauvin/erik/mobibot/modules/CurrencyConverter.kt  |  4 ++--
 .../java/net/thauvin/erik/mobibot/modules/WorldTime.kt |  2 +-
 11 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index 1900992..7028c22 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -258,10 +258,10 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
             isPrivate
         )
         send(sender, "The commands are:", isPrivate)
-        sendList(sender, addons.names, 8, isPrivate, true)
+        sendList(sender, addons.names, 8, isPrivate, isBold = true, isIndent = true)
         if (isOp) {
             send(sender, "The op commands are:", isPrivate)
-            sendList(sender, addons.ops, 8, isPrivate, true)
+            sendList(sender, addons.ops, 8, isPrivate, isBold = true, isIndent = true)
         }
     }
 
@@ -462,10 +462,8 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         list: List<String>,
         maxPerLine: Int,
         isPrivate: Boolean,
-        isBold: Boolean
-    ) {
-        var i = 0
-        while (i < list.size) {
+        isBold: Boolean = false,
+        isIndent: Boolean = false  while (i < list.size) {
             send(
                 nick,
                 helpFormat(
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 3168dde..862ca6a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -56,7 +56,7 @@ abstract class AbstractCommand(val bot: Mobibot) {
     open fun helpResponse(command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
         if (!this.isOp || this.isOp == isOp) {
             for (h in help) {
-                bot.send(sender, Utils.helpFormat(h, bot.nick, isPrivate), isPrivate)
+                bot.send(sender, Utils.buildCmdSyntax(h, bot.nick, isPrivate), isPrivate)
             }
             return true
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
index 2848369..7f7f567 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
@@ -63,7 +63,7 @@ class AddLog(bot: Mobibot) : AbstractCommand(bot) {
                     return
                 }
             }
-            bot.sendList(sender, history, 4, isPrivate, false)
+            bot.sendList(sender, history, 4, isPrivate, isIndent = true)
         }
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index 10f8fe6..91ea685 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -141,7 +141,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
 
         if (ignored.size > 0) {
             bot.send(sender, "The following nicks are ignored:", isPrivate)
-            bot.sendList(sender, ignored.toList(), 8, isPrivate, true)
+            bot.sendList(sender, ignored.sorted(), 8, isPrivate, isIndent = true)
         } else {
             bot.send(sender, "No one is currently ${Utils.bold("ignored")}.", isPrivate)
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index d16bd92..a9bf07b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -85,9 +85,7 @@ public class Info extends AbstractCommand {
                                 @NotNull final String args,
                                 final boolean isOp,
                                 final boolean isPrivate) {
-        for (final String v : version) {
-            getBot().send(sender, v, isPrivate);
-        }
+        getBot().sendList(sender, allVersions, 1, isPrivate, false, false);
 
         final StringBuilder info = new StringBuilder("Uptime: ");
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index f3f3960..a9493fa 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -58,7 +58,7 @@ class Modules(bot: Mobibot) : AbstractCommand(bot) {
                     send(sender, "There are no enabled modules.", isPrivate)
                 } else {
                     send(sender, "The enabled modules are: ", isPrivate)
-                    sendList(sender, modulesNames, 7, isPrivate, false)
+                    sendList(sender, modulesNames, 7, isPrivate, isIndent = true)
                 }
             } else {
                 helpDefault(sender, isOp, isPrivate)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index 5afdf5a..e3a868a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -64,6 +64,6 @@ class Users(bot: Mobibot) : AbstractCommand(bot) {
             }
         }
 
-        bot.sendList(sender, nicks.sorted(), 8, isPrivate, false)
+        bot.sendList(sender, nicks.sorted(), 8, isPrivate, isIndent = true)
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 8a2f168..662d073 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -40,7 +40,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 public class Versions extends AbstractCommand {
-    private final List<String> verList =
+    private final List<String> allVersions =
             List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
                     "Platform: " + System.getProperty("os.name") + ' ' + System.getProperty("os.version")
                     + " (" + System.getProperty("os.arch") + ')',
@@ -86,9 +86,7 @@ public class Versions extends AbstractCommand {
                                 final boolean isOp,
                                 final boolean isPrivate) {
         if (isOp) {
-            for (final String v : verList) {
-                getBot().send(sender, v, isPrivate);
-            }
+            getBot().sendList(sender, allVersions, 1, isPrivate, false, false);
         } else {
             getBot().helpDefault(sender, false, isPrivate);
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index eb97e4f..695549d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -76,7 +76,7 @@ abstract class AbstractModule(val bot: Mobibot) {
      */
     open fun helpResponse(sender: String, isPrivate: Boolean) {
         for (h in help) {
-            bot.send(sender, Utils.helpFormat(h, bot.nick, isPrivateMsgEnabled && isPrivate), isPrivate)
+            bot.send(sender, Utils.buildCmdSyntax(h, bot.nick, isPrivateMsgEnabled && isPrivate), isPrivate)
         }
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index ded4a6b..279f748 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -86,7 +86,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 }
             } else if (args.contains(CURRENCY_RATES_KEYWORD)) {
                 send(sender, "The currency rates for ${Utils.bold(pubDate)} are:", isPrivate)
-                sendList(sender, currencyRates(), 3, isPrivate, false)
+                sendList(sender, currencyRates(), 3, isPrivate, isIndent = true)
             } else {
                 helpResponse(sender, isPrivate)
             }
@@ -122,7 +122,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                     isPrivate
                 )
                 send(sender, "The supported currencies are: ", isPrivate)
-                sendList(sender, ArrayList(EXCHANGE_RATES.keys), 11, isPrivate, false)
+                sendList(sender, ArrayList(EXCHANGE_RATES.keys), 11, isPrivate, isIndent = true)
             }
         }
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 7695b0b..ed7ad74 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -191,7 +191,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         with(bot) {
             if (args.isEmpty()) {
                 send(sender, "The supported countries/zones are: ", isPrivate)
-                sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, isPrivate = false, isBold = false)
+                sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, isPrivate = false)
             } else {
                 val msg = worldTime(args)
                 if (isPrivate) {

From 629e26b2925a412ed32c8dcec8659df37081b7c6 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 8 Dec 2020 01:40:09 -0800
Subject: [PATCH 113/262] Cleanup.

---
 config/detekt/baseline.xml                    |  1 +
 .../java/net/thauvin/erik/mobibot/Addons.kt   |  9 +++--
 .../java/net/thauvin/erik/mobibot/Mobibot.kt  | 15 ++++---
 .../java/net/thauvin/erik/mobibot/Utils.kt    | 40 +++++++++++++------
 .../erik/mobibot/commands/AbstractCommand.kt  | 14 +------
 .../erik/mobibot/commands/ChannelFeed.kt      |  4 +-
 .../thauvin/erik/mobibot/commands/Debug.kt    |  3 +-
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  5 +--
 .../thauvin/erik/mobibot/commands/Info.java   |  4 +-
 .../thauvin/erik/mobibot/commands/Recap.kt    | 12 +-----
 .../thauvin/erik/mobibot/commands/Users.kt    |  4 +-
 .../erik/mobibot/commands/links/LinksMgr.kt   |  2 +-
 .../erik/mobibot/commands/links/Posting.kt    |  4 +-
 .../erik/mobibot/commands/links/Tags.kt       |  2 +-
 .../erik/mobibot/commands/tell/Tell.kt        | 10 ++---
 .../erik/mobibot/commands/tell/TellMessage.kt |  8 ----
 .../mobibot/commands/tell/TellMessagesMgr.kt  |  6 +--
 .../erik/mobibot/entries/EntriesUtils.kt      |  2 +-
 .../thauvin/erik/mobibot/entries/EntryLink.kt | 14 +------
 .../net/thauvin/erik/mobibot/modules/Calc.kt  |  2 +-
 .../erik/mobibot/modules/ModuleException.kt   |  8 ----
 .../mobibot/commands/tell/TellMessageTest.kt  |  1 -
 .../erik/mobibot/entries/EntryLinkTest.kt     |  4 +-
 .../erik/mobibot/modules/GoogleSearchTest.kt  |  2 +-
 .../erik/mobibot/modules/StockQuoteTest.kt    |  2 +-
 25 files changed, 75 insertions(+), 103 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index ac048e7..03d17a4 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -12,6 +12,7 @@
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
+    <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
     <ID>MagicNumber:AddLog.kt$AddLog$4</ID>
     <ID>MagicNumber:Comment.kt$Comment$3</ID>
diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
index 04dfcd8..9c8e769 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
@@ -69,8 +69,8 @@ class Addons {
      */
     fun add(command: AbstractCommand, props: Properties) {
         with(command) {
-            if (hasProperties()) {
-                getPropertyKeys().forEach {
+            if (properties.isNotEmpty()) {
+                properties.keys.forEach {
                     setProperty(it, props.getProperty(it, ""))
                 }
             }
@@ -111,13 +111,14 @@ class Addons {
     /**
      * Match a command.
      */
-    fun match(sender: String, login: String, message: String, isOp: Boolean, isPrivate: Boolean) {
+    fun match(sender: String, login: String, message: String, isOp: Boolean, isPrivate: Boolean): Boolean {
         for (command in commands) {
             if (command.matches(message)) {
                 command.commandResponse(sender, login, message, isOp, isPrivate)
-                break
+                return true
             }
         }
+        return false
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index 7028c22..ca7caa6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -397,10 +397,8 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
             sleep(3)
             quitServer("The Bot Is Out There!")
             exitProcess(0)
-        } else {
-            if (!addons.exec(sender, login, cmd, args, isOp, true)) {
-                helpDefault(sender, isOp, true)
-            }
+        } else if (!addons.exec(sender, login, cmd, args, isOp, true)) { // Execute command or module
+            helpDefault(sender, isOp, true)
         }
     }
 
@@ -463,13 +461,18 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         maxPerLine: Int,
         isPrivate: Boolean,
         isBold: Boolean = false,
-        isIndent: Boolean = false  while (i < list.size) {
+        isIndent: Boolean = false
+    ) {
+        var i = 0
+        while (i < list.size) {
             send(
                 nick,
                 helpFormat(
                     list.subList(i, list.size.coerceAtMost(i + maxPerLine)).joinToString(" ", truncated = ""),
                     isBold,
-                    isIndent        isPrivate
+                    isIndent
+                ),
+                isPrivate
             )
             i += maxPerLine
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index b4b91f6..7bf1580 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -38,6 +38,7 @@ 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
@@ -60,12 +61,28 @@ object Utils {
     @JvmStatic
     fun bold(i: Int): String = bold(i.toString())
 
+    /**
+     * Makes the given long bold.
+     */
+    @JvmStatic
+    fun bold(i: Long): String = bold(i.toString())
+
     /**
      * Makes the given string bold.
      */
     @JvmStatic
     fun bold(s: String?): String = colorize(s, Colors.BOLD)
 
+    /**
+     * Build a help command by replacing `%c` with the bot's pub/priv command, and `%n` with the bot's
+     * nick.
+     */
+    @JvmStatic
+    fun buildCmdSyntax(text: String, botNick: String, isPrivate: Boolean): String {
+        val replace = arrayOf(if (isPrivate) "/msg $botNick" else "$botNick:", botNick)
+        return StringUtils.replaceEach(text, searchFlags, replace)
+    }
+
     /**
      * Colorize a string.
      */
@@ -89,6 +106,7 @@ object Utils {
     /**
      * URL encodes the given string.
      */
+    @JvmStatic
     fun encodeUrl(s: String): String = URLEncoder.encode(s, StandardCharsets.UTF_8)
 
     /**
@@ -120,14 +138,10 @@ object Utils {
      */
     @JvmStatic
     fun getIntProperty(property: String?, def: Int): Int {
-        return if (property == null) {
+        return try {
+            property?.toInt() ?: def
+        } catch (nfe: NumberFormatException) {
             def
-        } else {
-            try {
-                property.toInt()
-            } catch (ignore: NumberFormatException) {
-                def
-            }
         }
     }
 
@@ -170,6 +184,12 @@ object Utils {
         } else s
     }
 
+    /**
+     * Returns the plural form of a word, if count &gt; 1.
+     */
+    @JvmStatic
+    fun plural(count: Int, word: String, plural: String): String = plural(count.toLong(), word, plural)
+
     /**
      * Returns the plural form of a word, if count &gt; 1.
      */
@@ -269,10 +289,6 @@ object Utils {
      */
     @JvmStatic
     fun utcDateTime(date: LocalDateTime?): String {
-        return if (date != null) {
-            date.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
-        } else {
-            ""
-        }
+        return date?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) ?: ""
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 862ca6a..338fbd6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -43,7 +43,7 @@ abstract class AbstractCommand(val bot: Mobibot) {
     abstract val isPublic: Boolean
     abstract val isVisible: Boolean
 
-    private val properties: MutableMap<String, String> = ConcurrentHashMap()
+    val properties: MutableMap<String, String> = ConcurrentHashMap()
 
     abstract fun commandResponse(
         sender: String,
@@ -63,18 +63,6 @@ abstract class AbstractCommand(val bot: Mobibot) {
         return false
     }
 
-    open fun getProperty(key: String): String? {
-        return properties[key]
-    }
-
-    open fun getPropertyKeys(): Set<String> {
-        return properties.keys
-    }
-
-    open fun hasProperties(): Boolean {
-        return properties.isNotEmpty()
-    }
-
     open fun initProperties(vararg keys: String) {
         keys.forEach {
             properties[it] = ""
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index f371422..3eee724 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -40,7 +40,7 @@ class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
     override val name = channel
     override val help = listOf(
         "To list the last 5 posts from the channel's weblog feed:",
-        Utils.helpIndent("%c $channel")
+        Utils.helpFormat("%c $channel")
     )
     override val isOp = false
     override val isPublic = true
@@ -61,7 +61,7 @@ class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        with(getProperty(FEED_PROP)) {
+        with(properties[FEED_PROP]) {
             if (!isNullOrBlank()) {
                 Thread(FeedReader(bot, sender, this)).start()
             } else {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
index 9bf3630..fa6b462 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
@@ -32,12 +32,13 @@
 
 package net.thauvin.erik.mobibot.commands
 
+import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
 import org.apache.logging.log4j.Level
 import org.apache.logging.log4j.core.config.Configurator
 
 class Debug(bot: Mobibot) : AbstractCommand(bot) {
-    override val name = "debug"
+    override val name = Constants.DEBUG_CMD
     override val help = emptyList<String>()
     override val isOp = true
     override val isPublic = false
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index 91ea685..1187286 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -35,7 +35,6 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.commands.links.LinksMgr
-import java.util.*
 
 class Ignore(bot: Mobibot) : AbstractCommand(bot) {
     private val me = "me"
@@ -67,7 +66,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
     companion object {
         const val IGNORE_CMD = "ignore"
         const val IGNORE_PROP = IGNORE_CMD
-        private val ignored = TreeSet<String>()
+        private val ignored = mutableSetOf<String>()
 
         @JvmStatic
         fun isNotIgnored(nick: String): Boolean {
@@ -150,7 +149,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
     override fun setProperty(key: String, value: String) {
         super.setProperty(key, value)
         if (IGNORE_PROP == key) {
-            ignored.addAll(value.split(LinksMgr.LINK_MATCH.toRegex()))
+            ignored.addAll(value.split(LinksMgr.TAG_MATCH.toRegex()))
         }
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index a9bf07b..09043aa 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -43,7 +43,7 @@ import java.lang.management.ManagementFactory;
 import java.util.List;
 
 public class Info extends AbstractCommand {
-    private final List<String> version = List.of(
+    private final List<String> allVersions = List.of(
             StringUtils.capitalize(ReleaseInfo.PROJECT) + " " + ReleaseInfo.VERSION
             + " (" + Utils.green(ReleaseInfo.WEBSITE) + ')',
             "Written by " + ReleaseInfo.AUTHOR + " (" + Utils.green(ReleaseInfo.AUTHOR_URL) + ')');
@@ -102,7 +102,7 @@ public class Info extends AbstractCommand {
             }
         }
 
-        info.append(", Recap: ").append(Recap.recapCount()).append(']');
+        info.append(", Recap: ").append(Recap.recaps.size()).append(']');
 
         getBot().send(sender, info.toString(), isPrivate);
     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
index 57477ef..d695e46 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -48,19 +48,11 @@ class Recap(bot: Mobibot) : AbstractCommand(bot) {
     override val isVisible = true
 
     companion object {
-        private val recaps = mutableListOf<String>()
-
-        @JvmStatic
-        fun recapCount(): Int {
-            return recaps.size
-        }
+        @JvmField
+        val recaps = mutableListOf<String>()
 
         /**
          * Stores the last 10 public messages and actions.
-         *
-         * @param sender   The nick of the person who sent the private message.
-         * @param message  The actual message sent.
-         * @param isAction Set to `true` if the message is an action.
          */
         @JvmStatic
         fun storeRecap(sender: String, message: String, isAction: Boolean) {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index e3a868a..9fab49e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -34,7 +34,6 @@ package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
-import org.jibble.pircbot.User
 
 class Users(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "users"
@@ -54,9 +53,8 @@ class Users(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        val users: Array<User> = bot.getUsers(bot.channel)
         val nicks = mutableListOf<String>()
-        users.forEach { user ->
+        bot.getUsers(bot.channel).forEach { user ->
             if (bot.isOp(user.nick)) {
                 nicks.add("@${user.nick}")
             } else {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index 374b9d5..80b4fbc 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -89,7 +89,7 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         fun startup(current: String, backlogs: String, channel: String) {
             startDate = EntriesMgr.loadEntries(current, channel, entries)
             if (Utils.today() != startDate) {
-                this.entries.clear()
+                entries.clear()
                 startDate = Utils.today()
             }
             EntriesMgr.loadBacklogs(backlogs, history)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 5582fbb..12a3f8d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -148,10 +148,10 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     private fun showEntry(index: Int) {
         val entry: EntryLink = entries[index]
         bot.send(EntriesUtils.buildLink(index, entry))
-        if (entry.hasTags()) {
+        if (entry.tags.isNotEmpty()) {
             bot.send(EntriesUtils.buildTags(index, entry))
         }
-        if (entry.hasComments()) {
+        if (entry.comments.isNotEmpty()) {
             val comments = entry.comments
             for (i in comments.indices) {
                 bot.send(EntriesUtils.buildComment(index, i, comments[i]))
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
index e07fe21..14ae0d2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -76,7 +76,7 @@ class Tags(bot: Mobibot) : AbstractCommand(bot) {
                     bot.send(sender, "Please ask a channel op to change the tags for you.", isPrivate)
                 }
             } else {
-                if (entry.hasTags()) {
+                if (entry.tags.isNotEmpty()) {
                     bot.send(EntriesUtils.buildTags(index, entry))
                 } else {
                     bot.send(sender, "The entry has no tags. Why don't add some?", isPrivate)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index af6a603..5627285 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -35,7 +35,7 @@ import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.Utils.helpIndent
+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
@@ -63,7 +63,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
      */
     private fun clean(): Boolean {
         if (bot.logger.isDebugEnabled) bot.logger.debug("Cleaning the messages.")
-        return TellMessagesMgr.clean(messages, maxDays)
+        return TellMessagesMgr.clean(messages, maxDays.toLong())
     }
 
     // Delete message.
@@ -88,7 +88,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
             } else {
                 var found = false
                 for (message in messages) {
-                    found = message.isMatchId(id)
+                    found = (message.id == id)
                     if (found && (message.sender.equals(sender, ignoreCase = true) || bot.isOp(sender))) {
                         messages.remove(message)
                         save()
@@ -122,7 +122,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
             "To view queued and sent messages:",
             helpFormat("%c $name ${View.VIEW_CMD}"),
             "Messages are kept for " + bold(maxDays)
-                + plural(maxDays.toLong(), " day.", " days.")
+                + plural(maxDays, " day.", " days.")
         )
     override val isOp: Boolean
         get() = false
@@ -313,7 +313,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
             )
             bot.send(
                 sender,
-                "Messages are kept for ${bold(maxDays)}${plural(maxDays.toLong(), " day.", " days.")}",
+                "Messages are kept for ${bold(maxDays)}${plural(maxDays, " day.", " days.")}",
                 isPrivate
             )
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
index 09dc5da..396b854 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
@@ -86,7 +86,6 @@ class TellMessage internal constructor(
      */
     var receptionDate: LocalDateTime = LocalDateTime.MIN
 
-
     /**
      * Matches the message sender or recipient.
      */
@@ -94,13 +93,6 @@ class TellMessage internal constructor(
         return sender.equals(nick, ignoreCase = true) || recipient.equals(nick, ignoreCase = true)
     }
 
-    /**
-     * Match the message ID.
-     */
-    fun isMatchId(id: String): Boolean {
-        return this.id == id
-    }
-
     override fun toString(): String {
         return ("TellMessage{id='$id', isNotified=$isNotified, isReceived=$isReceived, message='$message', " +
             "queued=$queued, received=$receptionDate, recipient='$recipient', sender='$sender'}")
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
index 8bc0b18..92e0e32 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -46,13 +46,13 @@ import java.time.LocalDateTime
 /**
  * The Tell Messages Manager.
  */
-internal object TellMessagesMgr {
+object TellMessagesMgr {
     /**
      * Cleans the messages queue.
      */
-    fun clean(tellMessages: MutableList<TellMessage>, tellMaxDays: Int): Boolean {
+    fun clean(tellMessages: MutableList<TellMessage>, tellMaxDays: Long): Boolean {
         val today = LocalDateTime.now(Clock.systemUTC())
-        return tellMessages.removeIf { o: TellMessage -> o.queued.plusDays(tellMaxDays.toLong()).isBefore(today) }
+        return tellMessages.removeIf { o: TellMessage -> o.queued.plusDays(tellMaxDays).isBefore(today) }
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index d9ca531..5f83aa2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -57,7 +57,7 @@ object EntriesUtils {
     fun buildLink(entryIndex: Int, entry: EntryLink, isView: Boolean = false): String {
         val buff = StringBuilder().append(buildLinkCmd(entryIndex)).append(": ")
             .append('[').append(entry.nick).append(']')
-        if (isView && entry.hasComments()) {
+        if (isView && entry.comments.isNotEmpty()) {
             buff.append("[+").append(entry.comments.size).append(']')
         }
         buff.append(' ')
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
index a33a180..b676591 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -107,8 +107,8 @@ class EntryLink : Serializable {
     /**
      * Adds a new comment.
      */
-    fun addComment(comment: String?, nick: String?): Int {
-        comments.add(EntryComment(comment!!, nick!!))
+    fun addComment(comment: String, nick: String): Int {
+        comments.add(EntryComment(comment, nick))
         return comments.size - 1
     }
 
@@ -139,16 +139,6 @@ class EntryLink : Serializable {
             return pinboardTags.toString()
         }
 
-    /**
-     * Returns true if the entry has comments.
-     */
-    fun hasComments(): Boolean = comments.isNotEmpty()
-
-    /**
-     * Returns true if the entry has tags.
-     */
-    fun hasTags(): Boolean = tags.isNotEmpty()
-
     /**
      * Returns true if a string is contained in the link, title, or nick.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
index b1ea6a2..5795480 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -75,6 +75,6 @@ class Calc(bot: Mobibot) : AbstractModule(bot) {
     init {
         commands.add(CALC_CMD)
         help.add("To solve a mathematical calculation:")
-        help.add(Utils.helpIndent("%c $CALC_CMD <calculation>"))
+        help.add(Utils.helpFormat("%c $CALC_CMD <calculation>"))
     }
 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
index f9a3d81..3e77d96 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -80,14 +80,6 @@ class ModuleException : Exception {
         }
     }
 
-    /**
-     * Return `true` if the exception has a cause.
-     */
-    @Suppress("unused")
-    fun hasCause(): Boolean {
-        return cause != null
-    }
-
     companion object {
         private const val serialVersionUID = 1L
     }
diff --git a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index 75a1139..57cdb46 100644
--- a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -58,7 +58,6 @@ class TellMessageTest {
         Assertions.assertThat(tellMessage.isMatch(sender)).`as`("match sender").isTrue
         Assertions.assertThat(tellMessage.isMatch(recipient)).`as`("match recipient").isTrue
         Assertions.assertThat(tellMessage.isMatch("foo")).`as`("foo is no match").isFalse
-        Assertions.assertThat(tellMessage.isMatchId(tellMessage.id)).`as`("is match ID").isTrue
         tellMessage.isReceived = true
         Assertions.assertThat(tellMessage.isReceived).`as`("is received").isTrue
         Assertions.assertThat(isValidDate(tellMessage.receptionDate)).`as`("received is valid date/time").isTrue
diff --git a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
index d92b58f..7e710f0 100644
--- a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -67,7 +67,7 @@ class EntryLinkTest {
         while (entryLink.comments.size > 0) {
             entryLink.deleteComment(r.nextInt(entryLink.comments.size))
         }
-        Assertions.assertThat(entryLink.hasComments()).`as`("hasComments()").isFalse
+        Assertions.assertThat(entryLink.comments.isNotEmpty()).`as`("hasComments()").isFalse
         entryLink.addComment("nothing", "nobody")
         entryLink.setComment(0, "something", "somebody")
         Assertions.assertThat(entryLink.getComment(0).nick).`as`("getNick(somebody)").isEqualTo("somebody")
@@ -81,7 +81,7 @@ class EntryLinkTest {
             Assertions.assertThat(tag.name).`as`("tag.getName($i)").isEqualTo("tag" + (i + 1))
         }
         Assertions.assertThat(entryLink.tags.size).`as`("getTags().size() is 5").isEqualTo(5)
-        Assertions.assertThat(entryLink.hasTags()).`as`("hasTags() is true").isTrue
+        Assertions.assertThat(entryLink.tags.isNotEmpty()).`as`("hasTags() is true").isTrue
         entryLink.setTags("-tag5")
         entryLink.setTags("+mobitopia")
         entryLink.setTags("tag4")
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index 8592447..6797682 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -62,7 +62,7 @@ class GoogleSearchTest : LocalProperties() {
                 .`as`("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
-            if ("true" == System.getenv("CI") && !apiKey.isBlank() && !cseKey.isBlank()) {
+            if ("true" == System.getenv("CI") && apiKey.isNotBlank() && cseKey.isNotBlank()) {
                 throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey, cseKey))
             } else {
                 throw e
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index c47509b..08f12db 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -63,7 +63,7 @@ class StockQuoteTest : LocalProperties() {
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
-            if ("true" == System.getenv("CI") && !apiKey.isBlank()) {
+            if ("true" == System.getenv("CI") && apiKey.isNotBlank()) {
                 throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey))
             } else {
                 throw e

From 4b52ab8c283c7928c217b8ead23c75f45c984521 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 8 Dec 2020 01:40:29 -0800
Subject: [PATCH 114/262] Version 0.8.0-beta+399

---
 version.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version.properties b/version.properties
index 8dcbee4..00ef133 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Dec 07 01:27:15 PST 2020
-version.buildmeta=372
+#Tue Dec 08 01:13:00 PST 2020
+version.buildmeta=399
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+372
+version.semver=0.8.0-beta+399

From aaecc8a9b4c71efbe9aba4ea5e6f148d2020d970 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 8 Dec 2020 12:17:38 -0800
Subject: [PATCH 115/262] Added addons.help()

---
 config/detekt/baseline.xml                    |  3 +-
 .../java/net/thauvin/erik/mobibot/Addons.kt   | 17 ++++++++
 .../java/net/thauvin/erik/mobibot/Mobibot.kt  | 40 +------------------
 .../erik/mobibot/modules/AbstractModule.kt    |  3 +-
 .../erik/mobibot/modules/CurrencyConverter.kt |  9 +++--
 5 files changed, 28 insertions(+), 44 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 03d17a4..bfccac4 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -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)</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>
@@ -75,6 +75,7 @@
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
+    <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
index 9c8e769..147aea0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
@@ -121,6 +121,23 @@ class Addons {
         return false
     }
 
+    /**
+     * Commands and Modules help.
+     */
+    fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean {
+        for (command in commands) {
+            if (command.isVisible && command.name.startsWith(topic)) {
+                return command.helpResponse(topic, sender, isOp, isPrivate)
+            }
+        }
+        for (module in modules) {
+            if (module.commands.contains(topic)) {
+                return module.helpResponse(sender, isPrivate)
+            }
+        }
+        return false
+    }
+
     /**
      * Sort commands and modules names.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index ca7caa6..a743c88 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -34,11 +34,11 @@ package net.thauvin.erik.mobibot
 import net.thauvin.erik.mobibot.PinboardUtils.addPin
 import net.thauvin.erik.mobibot.PinboardUtils.deletePin
 import net.thauvin.erik.mobibot.PinboardUtils.updatePin
+import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.colorize
 import net.thauvin.erik.mobibot.Utils.ensureDir
 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.isoLocalDate
 import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.commands.AddLog
@@ -234,18 +234,6 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         }
     }
 
-    /**
-     * Responds with the commands help, if any.
-     */
-    private fun helpCommands(sender: String, topic: String, isPrivate: Boolean): Boolean {
-        for (command in addons.commands) {
-            if (command.isVisible && command.name.startsWith(topic)) {
-                return command.helpResponse(topic, sender, isOp(sender), isPrivate)
-            }
-        }
-        return false
-    }
-
     /**
      * Responds with the default help.
      */
@@ -265,38 +253,14 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         }
     }
 
-    /**
-     * Responds with the modules help, if any.
-     */
-    private fun helpModules(sender: String, topic: String, isPrivate: Boolean): Boolean {
-        for (module in addons.modules) {
-            for (cmd in module.commands) {
-                if (topic == cmd) {
-                    module.helpResponse(sender, isPrivate)
-                    return true
-                }
-            }
-        }
-        return false
-    }
 
     /**
      * Responds with the default, commands or modules help.
      */
     private fun helpResponse(sender: String, topic: String, isPrivate: Boolean) {
         val isOp = isOp(sender)
-        if (topic.isBlank()) {
+        if (topic.isBlank() || !addons.help(sender, topic.toLowerCase().trim(), isOp, isPrivate)) {
             helpDefault(sender, isOp, isPrivate)
-        } else {
-            // Command, Modules or Default
-            if (!helpCommands(sender, topic, isPrivate) && !helpModules(
-                    sender,
-                    topic.toLowerCase().trim(),
-                    isPrivate
-                )
-            ) {
-                helpDefault(sender, isOp, isPrivate)
-            }
         }
     }
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index 695549d..4fe3d8d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -74,10 +74,11 @@ abstract class AbstractModule(val bot: Mobibot) {
     /**
      * Responds with the module's help.
      */
-    open fun helpResponse(sender: String, isPrivate: Boolean) {
+    open fun helpResponse(sender: String, isPrivate: Boolean) : Boolean {
         for (h in help) {
             bot.send(sender, Utils.buildCmdSyntax(h, bot.nick, isPrivateMsgEnabled && isPrivate), isPrivate)
         }
+        return true
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 279f748..6d9587a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -67,12 +67,12 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
      * Converts the specified currencies.
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        with(bot) {
+        bot.apply {
             if (EXCHANGE_RATES.isEmpty()) {
                 try {
                     loadRates()
                 } catch (e: ModuleException) {
-                    if (bot.logger.isWarnEnabled) logger.warn(e.debugMessage, e)
+                    if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
                 }
             }
 
@@ -93,8 +93,8 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         }
     }
 
-    override fun helpResponse(sender: String, isPrivate: Boolean) {
-        with(bot) {
+    override fun helpResponse(sender: String, isPrivate: Boolean) : Boolean {
+        bot.apply {
             if (EXCHANGE_RATES.isEmpty()) {
                 try {
                     loadRates()
@@ -125,6 +125,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 sendList(sender, ArrayList(EXCHANGE_RATES.keys), 11, isPrivate, isIndent = true)
             }
         }
+        return true
     }
 
     companion object {

From 19894dce1fbb2c64f55d9c2ce9d453ed020441b7 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 8 Dec 2020 12:29:47 -0800
Subject: [PATCH 116/262] Changed with(x) to x.apply

---
 config/detekt/baseline.xml                                  | 2 +-
 src/main/java/net/thauvin/erik/mobibot/Addons.kt            | 4 ++--
 src/main/java/net/thauvin/erik/mobibot/FeedReader.kt        | 2 +-
 src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt     | 2 +-
 src/main/java/net/thauvin/erik/mobibot/Utils.kt             | 3 +--
 .../java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt    | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt    | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt  | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/tell/Tell.kt     | 2 +-
 .../java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt     | 4 ++--
 .../java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt   | 2 +-
 .../java/net/thauvin/erik/mobibot/modules/AbstractModule.kt | 2 +-
 .../net/thauvin/erik/mobibot/modules/CurrencyConverter.kt   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt      | 2 +-
 .../java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt    | 4 ++--
 .../net/thauvin/erik/mobibot/modules/RockPaperScissors.kt   | 6 +++---
 .../java/net/thauvin/erik/mobibot/modules/StockQuote.kt     | 4 ++--
 src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt   | 6 +++---
 src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt  | 4 ++--
 src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt | 2 +-
 22 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index bfccac4..65149d6 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -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>
diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
index 147aea0..a9b91b0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
@@ -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, ""))
diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
index 23b124a..0d437ef 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
@@ -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 ->
diff --git a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
index addf76b..ad6cda7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -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(
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index 7bf1580..a165328 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -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 "))
             }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index 3eee724..f183340 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -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 {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
index 49832f2..6390b3f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -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)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
index fa6b462..54b8d6e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
@@ -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 {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index a9493fa..d42aa33 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -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)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index 5627285..be1fb89 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -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
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index 823d2ab..d4a63ac 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -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)
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index 5f83aa2..edbd5ac 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -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 {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index 4fe3d8d..726f5e2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -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)
         }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 6d9587a..07e5bca 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -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 {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
index fb20e9d..ace71ae 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -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)}"
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index bbaec32..de38941 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -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(
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
index 71a3037..31dbc9f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -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)
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index e22496a..11071c2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -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)}")
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
index a43eca2..101e387 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -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(
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
index beb3793..4535329 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -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,
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index a6133b4..3ee4532 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -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!!)}"))
                                     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index ed7ad74..487cba1 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -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)

From d33210c594a90f2c230b878c4ff93bd0f9adedd9 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 8 Dec 2020 14:29:51 -0800
Subject: [PATCH 117/262] Cleanup.

---
 src/main/java/net/thauvin/erik/mobibot/Mobibot.kt           | 4 +++-
 src/main/java/net/thauvin/erik/mobibot/Utils.kt             | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Info.java   | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/Versions.java    | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index a743c88..ea26829 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -399,7 +399,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      * Sends a notice to the channel.
      */
     fun send(notice: String?) {
-        if (notice != null) send(channel, notice, false)
+        notice?.let { send(channel, it, false) }
     }
 
     /**
@@ -419,6 +419,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     /**
      * Send a formatted commands/modules, etc. list.
      */
+    @JvmOverloads
     fun sendList(
         nick: String,
         list: List<String>,
@@ -600,6 +601,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     init {
         System.getProperties().setProperty("sun.net.client.defaultConnectTimeout", Constants.CONNECT_TIMEOUT.toString())
         System.getProperties().setProperty("sun.net.client.defaultReadTimeout", Constants.CONNECT_TIMEOUT.toString())
+
         name = nickname
         ircServer = p.getProperty("server", Constants.DEFAULT_SERVER)
         ircPort = getIntProperty(p.getProperty("port"), Constants.DEFAULT_PORT)
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index a165328..a8e7b63 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -156,7 +156,7 @@ object Utils {
     @JvmStatic
     @JvmOverloads
     fun helpFormat(help: String, isBold: Boolean = true, isIndent: Boolean = true): String {
-        return (if (isIndent) "      " else "").plus(if (isBold) bold(help) else help)
+        return (if (isIndent) "    " else "").plus(if (isBold) bold(help) else help)
     }
 
     /**
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index 09043aa..224daf3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -85,7 +85,7 @@ public class Info extends AbstractCommand {
                                 @NotNull final String args,
                                 final boolean isOp,
                                 final boolean isPrivate) {
-        getBot().sendList(sender, allVersions, 1, isPrivate, false, false);
+        getBot().sendList(sender, allVersions, 1, isPrivate);
 
         final StringBuilder info = new StringBuilder("Uptime: ");
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 662d073..7413156 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -41,10 +41,10 @@ import java.util.List;
 
 public class Versions extends AbstractCommand {
     private final List<String> allVersions =
-            List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
+            List.of("Version:  " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
                     "Platform: " + System.getProperty("os.name") + ' ' + System.getProperty("os.version")
                     + " (" + System.getProperty("os.arch") + ')',
-                    "Runtime: " + System.getProperty("java.runtime.name")
+                    "Runtime:  " + System.getProperty("java.runtime.name")
                     + ' ' + System.getProperty("java.runtime.version"));
 
     public Versions(@NotNull final Mobibot bot) {
@@ -86,7 +86,7 @@ public class Versions extends AbstractCommand {
                                 final boolean isOp,
                                 final boolean isPrivate) {
         if (isOp) {
-            getBot().sendList(sender, allVersions, 1, isPrivate, false, false);
+            getBot().sendList(sender, allVersions, 1, isPrivate);
         } else {
             getBot().helpDefault(sender, false, isPrivate);
         }

From e825f0e658e1d04ae03294c70e1f4b8cc1a3d306 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 8 Dec 2020 14:30:07 -0800
Subject: [PATCH 118/262] Version 0.8.0-beta+411

---
 version.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/version.properties b/version.properties
index 00ef133..824070f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Dec 08 01:13:00 PST 2020
-version.buildmeta=399
+#Tue Dec 08 13:34:40 PST 2020
+version.buildmeta=411
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+399
+version.semver=0.8.0-beta+411

From 8815cde78fa31330066d97fd14ee5dace7a5285e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 8 Dec 2020 15:11:12 -0800
Subject: [PATCH 119/262] Reverted to using with(x)

---
 src/main/java/net/thauvin/erik/mobibot/Addons.kt       |  4 ++--
 src/main/java/net/thauvin/erik/mobibot/FeedReader.kt   |  2 +-
 .../java/net/thauvin/erik/mobibot/PinboardUtils.kt     |  2 +-
 src/main/java/net/thauvin/erik/mobibot/Utils.kt        |  2 +-
 .../net/thauvin/erik/mobibot/commands/ChannelFeed.kt   |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Cycle.kt    |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Debug.kt    |  2 +-
 .../java/net/thauvin/erik/mobibot/commands/Modules.kt  |  2 +-
 .../net/thauvin/erik/mobibot/entries/EntriesMgr.kt     | 10 +++++-----
 .../net/thauvin/erik/mobibot/entries/EntriesUtils.kt   |  2 +-
 .../thauvin/erik/mobibot/modules/CurrencyConverter.kt  |  2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt |  2 +-
 .../net/thauvin/erik/mobibot/modules/GoogleSearch.kt   |  2 +-
 .../java/net/thauvin/erik/mobibot/modules/Lookup.kt    |  4 ++--
 .../thauvin/erik/mobibot/modules/RockPaperScissors.kt  |  6 +++---
 .../net/thauvin/erik/mobibot/modules/StockQuote.kt     |  4 ++--
 .../java/net/thauvin/erik/mobibot/modules/Twitter.kt   |  6 +++---
 .../java/net/thauvin/erik/mobibot/modules/Weather2.kt  |  4 ++--
 .../java/net/thauvin/erik/mobibot/modules/WorldTime.kt |  2 +-
 19 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
index a9b91b0..147aea0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
@@ -49,7 +49,7 @@ class Addons {
      * Add a module with properties.
      */
     fun add(module: AbstractModule, props: Properties) {
-        module.apply {
+        with(module) {
             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) {
-        command.apply {
+        with(command) {
             if (properties.isNotEmpty()) {
                 properties.keys.forEach {
                     setProperty(it, props.getProperty(it, ""))
diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
index 0d437ef..23b124a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
@@ -54,7 +54,7 @@ class FeedReader(
      * Fetches the Feed's items.
      */
     override fun run() {
-        bot.apply {
+        with(bot) {
             try {
                 val input = SyndFeedInput()
                 XmlReader(URL(url)).use { reader ->
diff --git a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
index ad6cda7..addf76b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -80,7 +80,7 @@ object PinboardUtils {
     @JvmStatic
     fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) = runBlocking {
         val update = GlobalScope.async {
-            entry.apply {
+            with(entry) {
                 if (oldUrl != link) {
                     poster.deletePin(oldUrl)
                     poster.addPin(
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index a8e7b63..4e49c89 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -244,7 +244,7 @@ object Utils {
         val minutes = TimeUnit.MILLISECONDS.toMinutes(uptime) - TimeUnit.HOURS.toMinutes(
             TimeUnit.MILLISECONDS.toHours(uptime)
         )
-        info.apply {
+        with(info) {
             if (years > 0) {
                 append(years).append(plural(years, " year ", " years "))
             }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index f183340..3eee724 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -61,7 +61,7 @@ class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        properties[FEED_PROP].apply {
+        with(properties[FEED_PROP]) {
             if (!isNullOrBlank()) {
                 Thread(FeedReader(bot, sender, this)).start()
             } else {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
index 6390b3f..49832f2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -51,7 +51,7 @@ class Cycle(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        bot.apply {
+        with(bot) {
             if (isOp) {
                 send("$sender has just asked me to leave. I'll be back!")
                 sleep(wait)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
index 54b8d6e..fa6b462 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
@@ -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) {
-            bot.apply {
+            with(bot) {
                 if (logger.isDebugEnabled) {
                     Configurator.setLevel(logger.name, loggerLevel)
                 } else {
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index d42aa33..a9493fa 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -52,7 +52,7 @@ class Modules(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        bot.apply {
+        with(bot) {
             if (isOp) {
                 if (modulesNames.isEmpty()) {
                     send(sender, "There are no enabled modules.", isPrivate)
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index d4a63ac..9cbd247 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -103,7 +103,7 @@ object EntriesMgr {
             val items = feed.entries
             var entry: EntryLink
             for (i in items.indices.reversed()) {
-                items[i].apply {
+                with(items[i]) {
                     entry = EntryLink(
                         link,
                         title,
@@ -145,7 +145,7 @@ object EntriesMgr {
                 OutputStreamWriter(
                     Files.newOutputStream(Paths.get(bot.logsDir + CURRENT_XML)), StandardCharsets.UTF_8
                 ).use { fw ->
-                    rss.apply {
+                    with(rss) {
                         feedType = "rss_2.0"
                         title = bot.channel + " IRC Links"
                         description = "Links from ${bot.ircServer} on ${bot.channel}"
@@ -156,7 +156,7 @@ object EntriesMgr {
                     var buff: StringBuilder
                     var comment: EntryComment
                     for (i in entries.size - 1 downTo 0) {
-                        entries[i].apply {
+                        with(entries[i]) {
                             buff = StringBuilder()
                                 .append("Posted by <b>")
                                 .append(nick)
@@ -210,7 +210,7 @@ object EntriesMgr {
                             Files.newOutputStream(Paths.get(bot.logsDir + NAV_XML)), StandardCharsets.UTF_8
                         ).use { fw ->
                             rss = SyndFeedImpl()
-                            rss.apply {
+                            with(rss) {
                                 feedType = "rss_2.0"
                                 title = "${bot.channel} IRC Links Backlogs"
                                 description = "Backlogs of Links from ${bot.ircServer} on ${bot.channel}"
@@ -222,7 +222,7 @@ object EntriesMgr {
                             for (i in history.size - 1 downTo 0) {
                                 date = history[i]
                                 item = SyndEntryImpl()
-                                item.apply {
+                                with(item) {
                                     link = bot.backlogsUrl + date + ".xml"
                                     title = date
                                     description = SyndContentImpl().apply { value = "Links for $date" }
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index edbd5ac..5f83aa2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -61,7 +61,7 @@ object EntriesUtils {
             buff.append("[+").append(entry.comments.size).append(']')
         }
         buff.append(' ')
-        entry.apply {
+        with(entry) {
             if (Constants.NO_TITLE == title) {
                 buff.append(title)
             } else {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 07e5bca..a617f0b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -94,7 +94,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
     }
 
     override fun helpResponse(sender: String, isPrivate: Boolean): Boolean {
-        bot.apply {
+        with(bot) {
             if (EXCHANGE_RATES.isEmpty()) {
                 try {
                     loadRates()
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
index ace71ae..fb20e9d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -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
-        bot.apply {
+        with(bot) {
             send(
                 channel,
                 "$sender rolled two dice: ${Utils.bold(playerRoll.first)} and ${Utils.bold(playerRoll.second)}"
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index de38941..bbaec32 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -50,7 +50,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
      * Searches Google.
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        bot.apply {
+        with(bot) {
             if (args.isNotBlank()) {
                 try {
                     val results = searchGoogle(
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
index 31dbc9f..71a3037 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -50,7 +50,7 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
         isPrivate: Boolean
     ) {
         if (args.matches("(\\S.)+(\\S)+".toRegex())) {
-            bot.apply {
+            with(bot) {
                 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>
-            whoisClient.apply {
+            with(whoisClient) {
                 try {
                     defaultTimeout = Constants.CONNECT_TIMEOUT
                     connect(host)
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 11071c2..e22496a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -42,13 +42,13 @@ import kotlin.random.Random
  */
 class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
     init {
-        commands.apply {
+        with(commands) {
             add(Hands.ROCK.name.toLowerCase())
             add(Hands.PAPER.name.toLowerCase())
             add(Hands.SCISSORS.name.toLowerCase())
         }
 
-        help.apply {
+        with(help) {
             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)]
-        bot.apply {
+        with(bot) {
             when {
                 hand == botHand -> {
                     send("${Utils.green(hand.name)} vs. ${Utils.green(botHand.name)}")
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 101e387..a43eca2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -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) {
-        bot.apply {
+        with(bot) {
             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 {
-                    messages.apply {
+                    with(messages) {
                         // Search for symbol/keywords
                         response = Utils.urlReader(
                             URL(
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
index 4535329..beb3793 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -86,7 +86,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
      * Send a notification to the registered Twitter handle.
      */
     fun notification(msg: String) {
-        bot.apply {
+        with(bot) {
             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) {
-        bot.apply {
+        with(bot) {
             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) {
-        bot.apply {
+        with(bot) {
             try {
                 send(
                     sender,
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index 3ee4532..a6133b4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -124,7 +124,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                             messages.add(
                                 PublicMessage("City: ${cwd.cityName} [${country.toUpperCase()}]")
                             )
-                            cwd.mainData.apply {
+                            with(cwd.mainData) {
                                 if (this != null) {
                                     if (hasTemp()) {
                                         messages.add(PublicMessage("Temperature: ${getTemps(temp)}"))
@@ -135,7 +135,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                                 }
                             }
                             if (cwd.hasWindData()) {
-                                cwd.windData.apply {
+                                with(cwd.windData) {
                                     if (this != null && hasSpeed() && speed != null) {
                                         messages.add(NoticeMessage("Wind: ${wind(speed!!)}"))
                                     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 487cba1..ed7ad74 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -188,7 +188,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         args: String,
         isPrivate: Boolean
     ) {
-        bot.apply {
+        with(bot) {
             if (args.isEmpty()) {
                 send(sender, "The supported countries/zones are: ", isPrivate)
                 sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, isPrivate = false)

From 6b5e8ab1ff3aaf0e1e487921700669c7a0f92998 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 11 Mar 2021 18:16:17 -0800
Subject: [PATCH 120/262] Fixed tests.

---
 src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt  | 4 ++--
 .../java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
index ed57c8e..fdbb51c 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -43,8 +43,8 @@ class LookupTest {
     @Test
     @Throws(Exception::class)
     fun testLookup() {
-        val result = lookup("erik.thauvin.net")
-        Assertions.assertThat(result).`as`("lookup(erik.thauvin.net/104.31.77.12)").contains("104.31.77.12")
+        val result = lookup("apple.com")
+    Assertions.assertThat(result).`as`("lookup(apple.com)").contains("17.253.144.10")
     }
 
     @Test
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index 08f12db..24d91d5 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -48,7 +48,7 @@ class StockQuoteTest : LocalProperties() {
             val messages = getQuote("apple inc", apiKey)
             Assertions.assertThat(messages).`as`("response not empty").isNotEmpty
             Assertions.assertThat(messages[0].msg).`as`("same stock symbol")
-                .isEqualTo("Symbol: AAPL [Apple Inc.]")
+                .startsWith("Symbol: AAPL")
             Assertions.assertThat(messages[1].msg).`as`("price label")
                 .startsWith("    Price:     ")
             try {

From 844253f2bcb4c575d044359d298e4fa050fc4766 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 11 Mar 2021 18:16:37 -0800
Subject: [PATCH 121/262] Added onVersion.

---
 src/main/java/net/thauvin/erik/mobibot/Mobibot.kt | 11 ++++++++++-
 version.properties                                |  6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index ea26829..be986bf 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -479,6 +479,14 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         }
     }
 
+    /**
+     * Returns the bot's version.
+     */
+    override fun onVersion(sourceNick: String, sourceLogin: String, sourceHostname: String, target: String) {
+        sendRawLine("NOTICE " + sourceNick + " :\u0001VERSION " + ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION
+                    + "\u0001")
+    }
+
     companion object {
         // Maximum number of times the bot will try to reconnect, if disconnected
         private const val MAX_RECONNECT = 10
@@ -614,7 +622,8 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         setVerbose(true)
         setAutoNickChange(true)
         login = p.getProperty("login", name)
-        version = ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION
+        // Set the real name
+        version = ReleaseInfo.PROJECT
         // setMessageDelay(1000);
 
         // Set NICKSERV identification
diff --git a/version.properties b/version.properties
index 824070f..0880ceb 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Dec 08 13:34:40 PST 2020
-version.buildmeta=411
+#Thu Mar 11 18:09:42 PST 2021
+version.buildmeta=428
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+411
+version.semver=0.8.0-beta+428

From c950d7349a249a1363028c9b33517c5a924b9319 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 12 Mar 2021 21:26:54 -0800
Subject: [PATCH 122/262] Updated dependencies.

---
 build.gradle                                  | 28 +++++------
 config/detekt/baseline.xml                    | 47 ++-----------------
 config/pmd.xml                                |  2 -
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../thauvin/erik/mobibot/commands/Info.java   |  5 +-
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  2 +-
 version.properties                            |  6 +--
 7 files changed, 25 insertions(+), 67 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8c0d5f3..8bc47e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,16 @@
 plugins {
     id 'application'
     id 'checkstyle'
-    id 'com.github.ben-manes.versions' version '0.36.0'
-    id 'com.github.spotbugs' version '4.6.0'
+    id 'com.github.ben-manes.versions' version '0.38.0'
+    id 'com.github.spotbugs' version '4.7.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.15.0-RC1'
+    id 'io.gitlab.arturbosch.detekt' version '1.16.0'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.4.20'
-    id 'org.jetbrains.kotlin.kapt' version '1.4.20'
-    id 'org.sonarqube' version '3.0'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.31'
+    id 'org.jetbrains.kotlin.kapt' version '1.4.31'
+    id 'org.sonarqube' version '3.1.1'
     id 'pmd'
 }
 
@@ -22,9 +22,9 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 
 ext.versions = [
     jacoco  : '0.8.6',
-    log4j   : '2.14.0',
-    pmd     : '6.29.0',
-    spotbugs: '4.2.0'
+    log4j   : '2.14.1',
+    pmd     : '6.32.0',
+    spotbugs: '4.2.2'
 ]
 
 repositories {
@@ -48,9 +48,9 @@ dependencies {
     implementation 'net.aksingh:owm-japis:2.5.3.0'
     implementation 'net.objecthunter:exp4j:0.4.8'
     implementation 'net.thauvin.erik:pinboard-poster:1.0.1'
-    implementation 'org.apache.commons:commons-lang3:3.11'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
-    implementation 'org.json:json:20201115'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3'
+    implementation 'org.json:json:20210307'
     implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
@@ -60,8 +60,8 @@ dependencies {
     compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
     testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
 
-    testImplementation 'org.assertj:assertj-core:3.18.1'
-    testImplementation 'org.testng:testng:7.3.0'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.testng:testng:7.4.0'
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'
     spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 65149d6..7d83c69 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -14,42 +14,6 @@
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
     <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
-    <ID>MagicNumber:AddLog.kt$AddLog$4</ID>
-    <ID>MagicNumber:Comment.kt$Comment$3</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$11</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$3</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$3</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$4</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$8</ID>
-    <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
-    <ID>MagicNumber:Dice.kt$Dice$7</ID>
-    <ID>MagicNumber:FeedReader.kt$FeedReader$5</ID>
-    <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$10</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$1000L</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$3</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$5</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$8</ID>
-    <ID>MagicNumber:Modules.kt$Modules$7</ID>
-    <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
-    <ID>MagicNumber:Tell.kt$Tell$50</ID>
-    <ID>MagicNumber:Tell.kt$Tell$7</ID>
-    <ID>MagicNumber:Twitter.kt$Twitter$1000L</ID>
-    <ID>MagicNumber:Twitter.kt$Twitter$60L</ID>
-    <ID>MagicNumber:Users.kt$Users$8</ID>
-    <ID>MagicNumber:Utils.kt$Utils$30</ID>
-    <ID>MagicNumber:Utils.kt$Utils$365</ID>
-    <ID>MagicNumber:Utils.kt$Utils$7</ID>
-    <ID>MagicNumber:View.kt$View$8</ID>
-    <ID>MagicNumber:Weather2.kt$Weather2.Companion$1.60934</ID>
-    <ID>MagicNumber:Weather2.kt$Weather2.Companion$32</ID>
-    <ID>MagicNumber:Weather2.kt$Weather2.Companion$5</ID>
-    <ID>MagicNumber:Weather2.kt$Weather2.Companion$9</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime$17</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3600</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$60</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$86.4</ID>
     <ID>MemberNameEqualsClassName:Calc.kt$Calc.Companion$ @JvmStatic fun calc(query: String): String</ID>
     <ID>MemberNameEqualsClassName:Lookup.kt$Lookup.Companion$ @JvmStatic @Throws(UnknownHostException::class) fun lookup(query: String): String</ID>
     <ID>MemberNameEqualsClassName:WorldTime.kt$WorldTime.Companion$ @JvmStatic fun worldTime(query: String): Message</ID>
@@ -74,19 +38,14 @@
     <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
+    <ID>PrintStackTrace:Mobibot.kt$Mobibot$e</ID>
+    <ID>PrintStackTrace:Mobibot.kt$Mobibot.Companion$e</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
+    <ID>SwallowedException:Calc.kt$Calc.Companion$catch (e: IllegalArgumentException) { "No idea. This is the kind of math I don't get." }</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
     <ID>ThrowsCount:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
-    <ID>TooGenericExceptionCaught:FeedReader.kt$FeedReader$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$ex: Exception</ID>
-    <ID>TooGenericExceptionCaught:StockQuote.kt$StockQuote.Companion$e: NullPointerException</ID>
-    <ID>TooGenericExceptionCaught:Weather2.kt$Weather2.Companion$e: NullPointerException</ID>
-    <ID>TooManyFunctions:Mobibot.kt$Mobibot : PircBot</ID>
-    <ID>TooManyFunctions:Tell.kt$Tell : AbstractCommand</ID>
-    <ID>TooManyFunctions:Utils.kt$Utils$Utils</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/config/pmd.xml b/config/pmd.xml
index dc39dbb..b1174f9 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -237,7 +237,6 @@
     <rule ref="category/java/performance.xml/AvoidArrayLoops"/>
     <rule ref="category/java/performance.xml/AvoidFileStream"/>
     <rule ref="category/java/performance.xml/AvoidInstantiatingObjectsInLoops"/>
-    <rule ref="category/java/performance.xml/AvoidUsingShortType"/>
     <rule ref="category/java/performance.xml/BigIntegerInstantiation"/>
     <rule ref="category/java/performance.xml/BooleanInstantiation"/>
     <rule ref="category/java/performance.xml/ByteInstantiation"/>
@@ -250,7 +249,6 @@
     <rule ref="category/java/performance.xml/LongInstantiation"/>
     <rule ref="category/java/performance.xml/OptimizableToArrayCall"/>
     <rule ref="category/java/performance.xml/RedundantFieldInitializer"/>
-    <rule ref="category/java/performance.xml/SimplifyStartsWith"/>
     <rule ref="category/java/performance.xml/ShortInstantiation"/>
     <rule ref="category/java/performance.xml/StringInstantiation"/>
     <rule ref="category/java/performance.xml/StringToString"/>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4d9ca16..442d913 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index 224daf3..e419d39 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -87,9 +87,10 @@ public class Info extends AbstractCommand {
                                 final boolean isPrivate) {
         getBot().sendList(sender, allVersions, 1, isPrivate);
 
-        final StringBuilder info = new StringBuilder("Uptime: ");
+        final StringBuilder info = new StringBuilder(29);
 
-        info.append(Utils.uptime(ManagementFactory.getRuntimeMXBean().getUptime()))
+        info.append("Uptime: ")
+            .append(Utils.uptime(ManagementFactory.getRuntimeMXBean().getUptime()))
             .append(" [Entries: ")
             .append(LinksMgr.entries.size());
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index ed7ad74..b03f416 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -64,7 +64,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             val zdt = ZonedDateTime.now(ZoneId.of("UTC+01:00"))
             val beats = ((zdt[ChronoField.SECOND_OF_MINUTE] + zdt[ChronoField.MINUTE_OF_HOUR] * 60
                 + zdt[ChronoField.HOUR_OF_DAY] * 3600) / 86.4).toInt()
-            return String.format("%c%03d", '@', beats)
+            return String.format(Locale.getDefault(), "%c%03d", '@', beats)
         }
 
         /**
diff --git a/version.properties b/version.properties
index 0880ceb..38c12ff 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Thu Mar 11 18:09:42 PST 2021
-version.buildmeta=428
+#Fri Mar 12 21:10:57 PST 2021
+version.buildmeta=434
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+428
+version.semver=0.8.0-beta+434

From aaf44db38a7c67f0ced31434d9decc6cf9444725 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 26 Apr 2021 15:23:21 -0700
Subject: [PATCH 123/262] Upgraded to Kotlin 1.5.0

---
 build.gradle                                  | 14 ++---
 config/pmd.xml                                |  4 --
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../java/net/thauvin/erik/mobibot/Mobibot.kt  |  8 +--
 .../net/thauvin/erik/mobibot/PinboardUtils.kt |  6 +-
 .../thauvin/erik/mobibot/commands/Ignore.kt   | 10 ++--
 .../erik/mobibot/commands/links/View.kt       |  2 +-
 .../thauvin/erik/mobibot/entries/EntryLink.kt |  2 +-
 .../erik/mobibot/modules/CurrencyConverter.kt |  8 +--
 .../erik/mobibot/modules/RockPaperScissors.kt | 16 +++---
 .../erik/mobibot/modules/StockQuote.kt        | 57 ++++++++++---------
 .../net/thauvin/erik/mobibot/modules/War.java |  2 +
 .../thauvin/erik/mobibot/modules/Weather2.kt  | 11 ++--
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  2 +-
 .../thauvin/erik/mobibot/LocalProperties.kt   |  2 +-
 version.properties                            |  6 +-
 16 files changed, 77 insertions(+), 75 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8bc47e5..1702a51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,8 @@ plugins {
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.4.31'
-    id 'org.jetbrains.kotlin.kapt' version '1.4.31'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.0'
+    id 'org.jetbrains.kotlin.kapt' version '1.5.0'
     id 'org.sonarqube' version '3.1.1'
     id 'pmd'
 }
@@ -23,8 +23,8 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 ext.versions = [
     jacoco  : '0.8.6',
     log4j   : '2.14.1',
-    pmd     : '6.32.0',
-    spotbugs: '4.2.2'
+    pmd     : '6.34.0',
+    spotbugs: '4.2.3'
 ]
 
 repositories {
@@ -44,12 +44,12 @@ dependencies {
 
     implementation 'com.rometools:rome:1.15.0'
     implementation 'commons-cli:commons-cli:1.4'
-    implementation 'commons-net:commons-net:3.7.2'
+    implementation 'commons-net:commons-net:3.8.0'
     implementation 'net.aksingh:owm-japis:2.5.3.0'
     implementation 'net.objecthunter:exp4j:0.4.8'
-    implementation 'net.thauvin.erik:pinboard-poster:1.0.1'
+    implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-RC'
     implementation 'org.json:json:20210307'
     implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
diff --git a/config/pmd.xml b/config/pmd.xml
index b1174f9..2760bff 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -30,7 +30,6 @@
     <rule ref="category/java/bestpractices.xml/SystemPrintln"/>
     <rule ref="category/java/bestpractices.xml/UnusedAssignment"/>
     <rule ref="category/java/bestpractices.xml/UnusedFormalParameter"/>
-    <rule ref="category/java/bestpractices.xml/UnusedImports"/>
     <rule ref="category/java/bestpractices.xml/UnusedLocalVariable"/>
     <rule ref="category/java/bestpractices.xml/UnusedPrivateField"/>
     <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"/>
@@ -59,8 +58,6 @@
     <rule ref="category/java/codestyle.xml/BooleanGetMethodName"/>
     <rule ref="category/java/codestyle.xml/CallSuperInConstructor"/>
     <rule ref="category/java/codestyle.xml/ControlStatementBraces"/>
-    <rule ref="category/java/codestyle.xml/DontImportJavaLang"/>
-    <rule ref="category/java/codestyle.xml/DuplicateImports"/>
     <rule ref="category/java/codestyle.xml/EmptyMethodInAbstractClassShouldBeAbstract"/>
     <rule ref="category/java/codestyle.xml/ExtendsObject"/>
     <rule ref="category/java/codestyle.xml/FieldDeclarationsShouldBeAtStartOfClass"/>
@@ -163,7 +160,6 @@
     <rule ref="category/java/errorprone.xml/FinalizeOverloaded"/>
     <rule ref="category/java/errorprone.xml/FinalizeShouldBeProtected"/>
     <rule ref="category/java/errorprone.xml/IdempotentOperations"/>
-    <rule ref="category/java/errorprone.xml/ImportFromSamePackage"/>
     <rule ref="category/java/errorprone.xml/InstantiationToGetClass"/>
     <rule ref="category/java/errorprone.xml/InvalidLogMessageFormat"/>
     <rule ref="category/java/errorprone.xml/JumbledIncrementer"/>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d913..f371643 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index be986bf..2d8b974 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -259,7 +259,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      */
     private fun helpResponse(sender: String, topic: String, isPrivate: Boolean) {
         val isOp = isOp(sender)
-        if (topic.isBlank() || !addons.help(sender, topic.toLowerCase().trim(), isOp, isPrivate)) {
+        if (topic.isBlank() || !addons.help(sender, topic.lowercase().trim(), isOp, isPrivate)) {
             helpDefault(sender, isOp, isPrivate)
         }
     }
@@ -317,7 +317,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         tell.send(sender, true)
         if (message.matches("(?i)${Pattern.quote(nick)}:.*".toRegex())) { // mobibot: <command>
             val cmds = message.substring(message.indexOf(':') + 1).trim().split(" ".toRegex(), 2)
-            val cmd = cmds[0].toLowerCase()
+            val cmd = cmds[0].lowercase()
             val args = if (cmds.size > 1) {
                 cmds[1].trim()
             } else ""
@@ -342,7 +342,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     ) {
         if (logger.isDebugEnabled) logger.debug(">>> $sender : $message")
         val cmds = message.split(" ".toRegex(), 2)
-        val cmd = cmds[0].toLowerCase()
+        val cmd = cmds[0].lowercase()
         val args = if (cmds.size > 1) {
             cmds[1].trim()
         } else ""
@@ -559,7 +559,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                         e.printStackTrace(System.err)
                         exitProcess(1)
                     }
-                    val nickname = p.getProperty("nick", Mobibot::class.java.name.toLowerCase())
+                    val nickname = p.getProperty("nick", Mobibot::class.java.name.lowercase())
                     val channel = p.getProperty("channel")
                     val logsDir = ensureDir(p.getProperty("logs", "."), false)
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
index addf76b..d5ce4c5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -51,7 +51,7 @@ object PinboardUtils {
      */
     @JvmStatic
     fun addPin(poster: PinboardPoster, ircServer: String, entry: EntryLink) = runBlocking {
-        val add = GlobalScope.async {
+        val add = async {
             poster.addPin(
                 entry.link,
                 entry.title,
@@ -68,7 +68,7 @@ object PinboardUtils {
      */
     @JvmStatic
     fun deletePin(poster: PinboardPoster, entry: EntryLink) = runBlocking {
-        val delete = GlobalScope.async {
+        val delete = async {
             poster.deletePin(entry.link)
         }
         delete.await()
@@ -79,7 +79,7 @@ object PinboardUtils {
      */
     @JvmStatic
     fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) = runBlocking {
-        val update = GlobalScope.async {
+        val update = async {
             with(entry) {
                 if (oldUrl != link) {
                     poster.deletePin(oldUrl)
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index 1187286..57191bc 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -70,7 +70,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
 
         @JvmStatic
         fun isNotIgnored(nick: String): Boolean {
-            return !ignored.contains(nick.toLowerCase())
+            return !ignored.contains(nick.lowercase())
         }
     }
 
@@ -82,8 +82,8 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
         isPrivate: Boolean
     ) {
         if (!isOp) {
-            val nick = sender.toLowerCase()
-            val isMe = args.toLowerCase().startsWith(me)
+            val nick = sender.lowercase()
+            val isMe = args.lowercase().startsWith(me)
             ignoreNick(bot, nick, isMe, isPrivate)
         } else {
             ignoreOp(bot, sender, args, isPrivate)
@@ -125,10 +125,10 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
 
     private fun ignoreOp(bot: Mobibot, sender: String, args: String, isPrivate: Boolean) {
         if (args.isNotEmpty()) {
-            val nicks = args.toLowerCase().split(" ")
+            val nicks = args.lowercase().split(" ")
             for (nick in nicks) {
                 val ignore = if (me == nick) {
-                    nick.toLowerCase()
+                    nick.lowercase()
                 } else {
                     nick
                 }
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index 0ea0708..db34ffb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -70,7 +70,7 @@ class View(bot: Mobibot) : AbstractCommand(bot) {
 
     private fun showPosts(bot: Mobibot, args: String, sender: String) {
         val max = entries.size
-        var lcArgs = args.toLowerCase()
+        var lcArgs = args.lowercase()
         var i = 0
         if (lcArgs.isEmpty() && max > maxEntries) {
             i = max - maxEntries
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
index b676591..9596534 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -172,7 +172,7 @@ class EntryLink : Serializable {
             var category: SyndCategoryImpl
             for (tag in tags) {
                 if (!tag.isNullOrBlank()) {
-                    val t = tag.toLowerCase()
+                    val t = tag.lowercase()
                     val mod = t[0]
                     if (mod == '-') {
                         // Don't remove the channel tag
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index a617f0b..96534a8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -157,8 +157,8 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 if (cmds[3] == cmds[1] || "0" == cmds[0]) {
                     PublicMessage("You're kidding, right?")
                 } else {
-                    val to = cmds[1].toUpperCase()
-                    val from = cmds[3].toUpperCase()
+                    val to = cmds[1].uppercase()
+                    val from = cmds[3].uppercase()
                     if (EXCHANGE_RATES.containsKey(to) && EXCHANGE_RATES.containsKey(from)) {
                         try {
                             val amt = cmds[0].replace(",", "").toDouble()
@@ -166,10 +166,10 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                             val doubleTo = EXCHANGE_RATES[from]!!.toDouble()
                             PublicMessage(
                                 NumberFormat.getCurrencyInstance(Constants.LOCALE).format(amt).substring(1)
-                                    + " ${cmds[1].toUpperCase()} = "
+                                    + " ${cmds[1].uppercase()} = "
                                     + NumberFormat.getCurrencyInstance(Constants.LOCALE)
                                     .format(amt * doubleTo / doubleFrom).substring(1)
-                                    + " ${cmds[3].toUpperCase()}"
+                                    + " ${cmds[3].uppercase()}"
                             )
                         } catch (e: NumberFormatException) {
                             ErrorMessage("Let's try with some real numbers next time, okay?")
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index e22496a..940c3a7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -43,17 +43,17 @@ import kotlin.random.Random
 class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
     init {
         with(commands) {
-            add(Hands.ROCK.name.toLowerCase())
-            add(Hands.PAPER.name.toLowerCase())
-            add(Hands.SCISSORS.name.toLowerCase())
+            add(Hands.ROCK.name.lowercase())
+            add(Hands.PAPER.name.lowercase())
+            add(Hands.SCISSORS.name.lowercase())
         }
 
         with(help) {
             add("To play Rock Paper Scissors:")
             add(
                 Utils.helpFormat(
-                    "%c ${Hands.ROCK.name.toLowerCase()} | ${Hands.PAPER.name.toLowerCase()}"
-                        + " | ${Hands.SCISSORS.name.toLowerCase()}"
+                    "%c ${Hands.ROCK.name.lowercase()} | ${Hands.PAPER.name.lowercase()}"
+                        + " | ${Hands.SCISSORS.name.lowercase()}"
                 )
             )
         }
@@ -82,8 +82,8 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
     companion object {
         // For testing.
         fun winLoseOrDraw(player: String, bot: String): String {
-            val hand = Hands.valueOf(player.toUpperCase())
-            val botHand = Hands.valueOf(bot.toUpperCase())
+            val hand = Hands.valueOf(player.uppercase())
+            val botHand = Hands.valueOf(bot.uppercase())
 
             return when {
                 hand == botHand -> "draw"
@@ -94,7 +94,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 hand = Hands.valueOf(cmd.uppercase())
         val botHand = Hands.values()[Random.nextInt(0, Hands.values().size)]
         with(bot) {
             when {
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
index a43eca2..3244e41 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -121,7 +121,8 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
         @Throws(ModuleException::class)
         fun getQuote(symbol: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
-                throw ModuleException("${STOCK_CMD.capitalize()} is disabled. The API key is missing.")
+                throw ModuleException(
+                    "${STOCK_CMD.replaceFirstChar { it.uppercase() }} is disabled. The API key is missing.")
             }
             return if (symbol.isNotBlank()) {
                 val debugMessage = "getQuote($symbol)"
@@ -131,10 +132,10 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                     with(messages) {
                         // Search for symbol/keywords
                         response = Utils.urlReader(
-                            URL(
-                                "${ALAPHAVANTAGE_URL}SYMBOL_SEARCH&keywords=" + Utils.encodeUrl(symbol) + "&apikey="
-                                    + Utils.encodeUrl(apiKey)
-                            )
+                                URL(
+                                        "${ALAPHAVANTAGE_URL}SYMBOL_SEARCH&keywords=" + Utils.encodeUrl(symbol)
+                                            + "&apikey=" + Utils.encodeUrl(apiKey)
+                                )
                         )
                         var json = getJsonResponse(response, debugMessage)
                         val symbols = json.getJSONArray("bestMatches")
@@ -145,11 +146,11 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
 
                             // Get quote for symbol
                             response = Utils.urlReader(
-                                URL(
-                                    "${ALAPHAVANTAGE_URL}GLOBAL_QUOTE&symbol="
-                                        + Utils.encodeUrl(symbolInfo.getString("1. symbol"))
-                                        + "&apikey=" + Utils.encodeUrl(apiKey)
-                                )
+                                    URL(
+                                            "${ALAPHAVANTAGE_URL}GLOBAL_QUOTE&symbol="
+                                                    + Utils.encodeUrl(symbolInfo.getString("1. symbol"))
+                                                    + "&apikey=" + Utils.encodeUrl(apiKey)
+                                    )
                             )
                             json = getJsonResponse(response, debugMessage)
                             val quote = json.getJSONObject("Global Quote")
@@ -158,36 +159,36 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                                 return messages
                             }
                             add(
-                                PublicMessage(
-                                    "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol"))
-                                        + " [" + Utils.unescapeXml(symbolInfo.getString("2. name")) + ']'
-                                )
+                                    PublicMessage(
+                                            "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol"))
+                                                    + " [" + Utils.unescapeXml(symbolInfo.getString("2. name")) + ']'
+                                    )
                             )
                             add(PublicMessage("    Price:     " + Utils.unescapeXml(quote.getString("05. price"))))
                             add(
-                                PublicMessage(
-                                    "    Previous:  " + Utils.unescapeXml(quote.getString("08. previous close"))
-                                )
+                                    PublicMessage(
+                                            "    Previous:  " + Utils.unescapeXml(quote.getString("08. previous close"))
+                                    )
                             )
                             add(NoticeMessage("    Open:      " + Utils.unescapeXml(quote.getString("02. open"))))
                             add(NoticeMessage("    High:      " + Utils.unescapeXml(quote.getString("03. high"))))
                             add(NoticeMessage("    Low:       " + Utils.unescapeXml(quote.getString("04. low"))))
                             add(
-                                NoticeMessage(
-                                    "    Volume:    " + Utils.unescapeXml(quote.getString("06. volume"))
-                                )
+                                    NoticeMessage(
+                                            "    Volume:    " + Utils.unescapeXml(quote.getString("06. volume"))
+                                    )
                             )
                             add(
-                                NoticeMessage(
-                                    "    Latest:    "
-                                        + Utils.unescapeXml(quote.getString("07. latest trading day"))
-                                )
+                                    NoticeMessage(
+                                            "    Latest:    "
+                                                    + Utils.unescapeXml(quote.getString("07. latest trading day"))
+                                    )
                             )
                             add(
-                                NoticeMessage(
-                                    "    Change:    " + Utils.unescapeXml(quote.getString("09. change"))
-                                        + " [" + Utils.unescapeXml(quote.getString("10. change percent")) + ']'
-                                )
+                                    NoticeMessage(
+                                            "    Change:    " + Utils.unescapeXml(quote.getString("09. change")) + " ["
+                                                    + Utils.unescapeXml(quote.getString("10. change percent")) + ']'
+                                    )
                             )
                         }
                     }
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index b239e87..2cfe28e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -32,6 +32,7 @@
 
 package net.thauvin.erik.mobibot.modules;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
 import org.jetbrains.annotations.NotNull;
@@ -71,6 +72,7 @@ public final class War extends AbstractModule {
     /**
      * {@inheritDoc}
      */
+    @SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE")
     @Override
     public void commandResponse(@NotNull final String sender,
                                 @NotNull final String cmd,
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index a6133b4..f3b740d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -100,7 +100,8 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
         @Throws(ModuleException::class)
         fun getWeather(query: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
-                throw ModuleException("${WEATHER_CMD.capitalize()} is disabled. The API key is missing.")
+                throw ModuleException(
+                    "${WEATHER_CMD.replaceFirstChar { it.uppercase() }} is disabled. The API key is missing.")
             }
             val owm = OWM(apiKey)
             val messages = mutableListOf<Message>()
@@ -122,7 +123,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                         }
                         if (cwd.hasCityName()) {
                             messages.add(
-                                PublicMessage("City: ${cwd.cityName} [${country.toUpperCase()}]")
+                                PublicMessage("City: ${cwd.cityName} [${country.uppercase()}]")
                             )
                             with(cwd.mainData) {
                                 if (this != null) {
@@ -147,7 +148,9 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                                 if (list != null) {
                                     for (w in list) {
                                         if (w != null) {
-                                            condition.append(' ').append(w.getDescription().capitalize()).append('.')
+                                            condition.append(' ')
+                                                .append(w.getDescription().replaceFirstChar { it.uppercase() })
+                                                .append('.')
                                         }
                                     }
                                     messages.add(NoticeMessage(condition.toString()))
@@ -162,7 +165,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                                     messages.add(
                                         NoticeMessage(
                                             "https://openweathermap.org/find?q="
-                                                + Utils.encodeUrl("$city,${country.toUpperCase()}"),
+                                                + Utils.encodeUrl("$city,${country.uppercase()}"),
                                             Colors.GREEN
                                         )
                                     )
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index b03f416..e1f11c3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -72,7 +72,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
          */
         @JvmStatic
         fun worldTime(query: String): Message {
-            val tz = COUNTRIES_MAP[(query.substring(query.indexOf(' ') + 1).trim()).toUpperCase()]
+            val tz = COUNTRIES_MAP[(query.substring(query.indexOf(' ') + 1).trim()).uppercase()]
             val response: String = if (tz != null) {
                 if (BEATS_KEYWORD == tz) {
                     "The current Internet Time is: " + Utils.bold(internetTime() + ' ' + BEATS_KEYWORD)
diff --git a/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt b/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
index 04490ed..564b7fb 100644
--- a/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
@@ -69,7 +69,7 @@ open class LocalProperties {
         }
 
         private fun keyToEnv(key: String): String {
-            return key.replace('-', '_').toUpperCase()
+            return key.replace('-', '_').uppercase()
         }
     }
 }
diff --git a/version.properties b/version.properties
index 38c12ff..8b8d651 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Mar 12 21:10:57 PST 2021
-version.buildmeta=434
+#Mon Apr 26 15:10:03 PDT 2021
+version.buildmeta=452
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+434
+version.semver=0.8.0-beta+452

From 3f75d60c5f4efcfc53bfccd073172bd7b5fd0ed1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 26 Apr 2021 16:20:07 -0700
Subject: [PATCH 124/262] Updated detekt baseline location.

---
 build.gradle       | 2 +-
 version.properties | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1702a51..d48195b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,7 +127,7 @@ pmd {
 }
 
 detekt {
-    baseline = file("${projectDir}/config/detekt/baseline.xml")
+    baseline = file("${rootProject.projectDir}/config/detekt/baseline.xml")
 }
 
 javadoc {
diff --git a/version.properties b/version.properties
index 8b8d651..4cc2ed0 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Apr 26 15:10:03 PDT 2021
-version.buildmeta=452
+#Mon Apr 26 16:18:54 PDT 2021
+version.buildmeta=454
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+452
+version.semver=0.8.0-beta+454

From 7b2b496a94041a09ee450c717c3f88ebba07ac4d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 26 Apr 2021 18:02:54 -0700
Subject: [PATCH 125/262] Prevent detekt from from failing, for now.

---
 build.gradle       | 3 ++-
 version.properties | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index d48195b..0644bfb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,7 +127,8 @@ pmd {
 }
 
 detekt {
-    baseline = file("${rootProject.projectDir}/config/detekt/baseline.xml")
+    ignoreFailures = true // Baseline is incomplete and fails on various CIs, not sure why.
+    baseline = file("${projectDir}/config/detekt/baseline.xml")
 }
 
 javadoc {
diff --git a/version.properties b/version.properties
index 4cc2ed0..6d5aa2a 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Apr 26 16:18:54 PDT 2021
-version.buildmeta=454
+#Mon Apr 26 18:00:07 PDT 2021
+version.buildmeta=462
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+454
+version.semver=0.8.0-beta+462

From 8b8cbb39f8524c255d3c125b43d0116fbfd946a5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 26 Apr 2021 22:06:13 -0700
Subject: [PATCH 126/262] Added Utils.capitalize()

---
 src/main/java/net/thauvin/erik/mobibot/Utils.kt        | 10 +++++++++-
 .../java/net/thauvin/erik/mobibot/commands/Info.java   |  3 +--
 .../net/thauvin/erik/mobibot/modules/GoogleSearch.kt   |  3 +--
 .../net/thauvin/erik/mobibot/modules/StockQuote.kt     |  2 +-
 .../java/net/thauvin/erik/mobibot/modules/Weather2.kt  |  4 ++--
 src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt    |  7 +++++++
 version.properties                                     |  6 +++---
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index 4e49c89..62f1695 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -81,7 +81,15 @@ object Utils {
         val replace = arrayOf(if (isPrivate) "/msg $botNick" else "$botNick:", botNick)
         return StringUtils.replaceEach(text, searchFlags, replace)
     }
-
+    
+    /**
+     * Capitalize a string.
+     */
+    @JvmStatic
+    fun capitalize(s: String?): String {
+        return s!!.replaceFirstChar { it.uppercase() }
+    }
+    
     /**
      * Colorize a string.
      */
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index e419d39..5af7d4b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -36,7 +36,6 @@ import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.ReleaseInfo;
 import net.thauvin.erik.mobibot.Utils;
 import net.thauvin.erik.mobibot.commands.links.LinksMgr;
-import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.management.ManagementFactory;
@@ -44,7 +43,7 @@ import java.util.List;
 
 public class Info extends AbstractCommand {
     private final List<String> allVersions = List.of(
-            StringUtils.capitalize(ReleaseInfo.PROJECT) + " " + ReleaseInfo.VERSION
+            Utils.capitalize(ReleaseInfo.PROJECT) + " " + ReleaseInfo.VERSION
             + " (" + Utils.green(ReleaseInfo.WEBSITE) + ')',
             "Written by " + ReleaseInfo.AUTHOR + " (" + Utils.green(ReleaseInfo.AUTHOR_URL) + ')');
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index bbaec32..a801f55 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -35,7 +35,6 @@ import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
-import org.apache.commons.lang3.StringUtils
 import org.jibble.pircbot.Colors
 import org.json.JSONException
 import org.json.JSONObject
@@ -87,7 +86,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
         @Throws(ModuleException::class)
         fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List<Message> {
             if (apiKey.isNullOrBlank() || cseKey.isNullOrBlank()) {
-                throw ModuleException("${StringUtils.capitalize(GOOGLE_CMD)} is disabled. The API keys are missing.")
+                throw ModuleException("${Utils.capitalize(GOOGLE_CMD)} is disabled. The API keys are missing.")
             }
             return if (query.isNotBlank()) {
                 val results = mutableListOf<Message>()
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 3244e41..e9c2905 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -122,7 +122,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
         fun getQuote(symbol: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
                 throw ModuleException(
-                    "${STOCK_CMD.replaceFirstChar { it.uppercase() }} is disabled. The API key is missing.")
+                    "${Utils.capitalize(STOCK_CMD)} is disabled. The API key is missing.")
             }
             return if (symbol.isNotBlank()) {
                 val debugMessage = "getQuote($symbol)"
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index f3b740d..5a164b5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -101,7 +101,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
         fun getWeather(query: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
                 throw ModuleException(
-                    "${WEATHER_CMD.replaceFirstChar { it.uppercase() }} is disabled. The API key is missing.")
+                    "${Utils.capitalize(WEATHER_CMD)} is disabled. The API key is missing.")
             }
             val owm = OWM(apiKey)
             val messages = mutableListOf<Message>()
@@ -149,7 +149,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                                     for (w in list) {
                                         if (w != null) {
                                             condition.append(' ')
-                                                .append(w.getDescription().replaceFirstChar { it.uppercase() })
+                                                .append(Utils.capitalize(w.getDescription()))
                                                 .append('.')
                                         }
                                     }
diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
index fbe1ffb..f62663d 100644
--- a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -32,6 +32,7 @@
 package net.thauvin.erik.mobibot
 
 import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.capitalize
 import net.thauvin.erik.mobibot.Utils.colorize
 import net.thauvin.erik.mobibot.Utils.cyan
 import net.thauvin.erik.mobibot.Utils.ensureDir
@@ -77,6 +78,12 @@ class UtilsTest {
         Assertions.assertThat(bold(ascii)).`as`("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
     }
 
+    @Test
+    fun testCapitalize() {
+        Assertions.assertThat(capitalize("test")).`as`("capitalize(test)").isEqualTo("Test")
+        Assertions.assertThat(capitalize("Test")).`as`("capitalize(Test)").isEqualTo("Test")
+    }
+
     @Test
     fun testColorize() {
         Assertions.assertThat(colorize(ascii, Colors.REVERSE)).`as`("colorize(reverse)").isEqualTo(
diff --git a/version.properties b/version.properties
index 6d5aa2a..cffabaf 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Apr 26 18:00:07 PDT 2021
-version.buildmeta=462
+#Mon Apr 26 22:03:01 PDT 2021
+version.buildmeta=474
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+462
+version.semver=0.8.0-beta+474

From ae6220d421c68a8eb54594c135a7030dc4100e16 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 26 Apr 2021 22:15:54 -0700
Subject: [PATCH 127/262] Updated copyright.

---
 LICENSE.txt                                                 | 2 +-
 licenses/LICENSE.txt                                        | 2 +-
 src/main/java/net/thauvin/erik/mobibot/Addons.kt            | 2 +-
 src/main/java/net/thauvin/erik/mobibot/Constants.kt         | 2 +-
 src/main/java/net/thauvin/erik/mobibot/FeedReader.kt        | 2 +-
 src/main/java/net/thauvin/erik/mobibot/Mobibot.kt           | 2 +-
 src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt     | 2 +-
 src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java    | 2 +-
 src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt      | 2 +-
 src/main/java/net/thauvin/erik/mobibot/Utils.kt             | 2 +-
 .../net/thauvin/erik/mobibot/commands/AbstractCommand.kt    | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt   | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt    | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt    | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Info.java   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Me.kt       | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt  | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt      | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt     | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt    | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Say.kt      | 2 +-
 src/main/java/net/thauvin/erik/mobibot/commands/Users.kt    | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/Versions.java    | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/links/Comment.kt | 2 +-
 .../net/thauvin/erik/mobibot/commands/links/LinksMgr.kt     | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/links/Posting.kt | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/links/Tags.kt    | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/links/View.kt    | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/tell/Tell.kt     | 2 +-
 .../thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt   | 2 +-
 .../java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt     | 2 +-
 .../java/net/thauvin/erik/mobibot/entries/EntryComment.kt   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt | 2 +-
 .../java/net/thauvin/erik/mobibot/modules/AbstractModule.kt | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt      | 2 +-
 .../net/thauvin/erik/mobibot/modules/CurrencyConverter.kt   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt      | 2 +-
 .../java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt      | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt    | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt      | 2 +-
 .../net/thauvin/erik/mobibot/modules/RockPaperScissors.kt   | 2 +-
 .../java/net/thauvin/erik/mobibot/modules/StockQuote.kt     | 2 +-
 .../java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt   | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/War.java     | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt  | 2 +-
 src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt | 2 +-
 src/main/java/net/thauvin/erik/mobibot/msg/Message.kt       | 2 +-
 src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt   | 2 +-
 src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt | 2 +-
 .../thauvin/erik/mobibot/commands/tell/TellMessageTest.kt   | 2 +-
 .../java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt  | 2 +-
 src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt  | 2 +-
 .../net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt    | 2 +-
 .../thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt   | 2 +-
 .../java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt | 2 +-
 version.properties                                          | 6 +++---
 60 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 37785b0..1cd28ec 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/licenses/LICENSE.txt b/licenses/LICENSE.txt
index 37785b0..1cd28ec 100644
--- a/licenses/LICENSE.txt
+++ b/licenses/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
index 147aea0..7651d91 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
@@ -1,7 +1,7 @@
 /*
  * Addons.java
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.kt b/src/main/java/net/thauvin/erik/mobibot/Constants.kt
index 575e29a..317cc35 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Constants.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Constants.kt
@@ -1,7 +1,7 @@
 /*
  * Constants.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
index 23b124a..0cba397 100644
--- a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
@@ -1,7 +1,7 @@
 /*
  * FeedReader.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
index 2d8b974..a6e4be9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
@@ -1,7 +1,7 @@
 /*
  * Mobibot.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
index d5ce4c5..29460ed 100644
--- a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -1,7 +1,7 @@
 /*
  * PinboardUtils.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java b/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
index dbc7cb9..8396fce 100644
--- a/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
+++ b/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
@@ -1,7 +1,7 @@
 /*
  * TwitterOAuth.java
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt b/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
index 5db5a93..0b8ad2a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
@@ -1,7 +1,7 @@
 /*
  * TwitterTimer.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index 62f1695..a549ac3 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -1,7 +1,7 @@
 /*
  * Utils.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 338fbd6..2c02589 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -1,7 +1,7 @@
 /*
  * AbstractCommand.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
index 7f7f567..261a154 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
@@ -1,7 +1,7 @@
 /*
  * AddLog.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index 3eee724..637aec5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -1,7 +1,7 @@
 /*
  * Feed.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
index 49832f2..a62b87f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -1,7 +1,7 @@
 /*
  * Cycle.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
index fa6b462..8c3c97b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
@@ -1,7 +1,7 @@
 /*
  * Debug.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
index 57191bc..cdcc77f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -1,7 +1,7 @@
 /*
  * Ignore.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index 5af7d4b..b758885 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -1,7 +1,7 @@
 /*
  * InfoJ.java
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
index fa0861b..c668fe0 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
@@ -1,7 +1,7 @@
 /*
  * Me.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
index a9493fa..d2d780b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -1,7 +1,7 @@
 /*
  * Modules.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
index 31693c6..4e7aa4d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -1,7 +1,7 @@
 /*
  * Msg.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
index c6c7d2c..fa1ff2c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -1,7 +1,7 @@
 /*
  * Nick.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
index d695e46..364fc5f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -1,7 +1,7 @@
 /*
  * Recap.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
index 7651d9d..af08502 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
@@ -1,7 +1,7 @@
 /*
  * Say.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
index 9fab49e..759b54c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
@@ -1,7 +1,7 @@
 /*
  * Users.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 7413156..685684f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -1,7 +1,7 @@
 /*
  * Version.java
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 35b644c..8b55a5d 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -1,7 +1,7 @@
 /*
  * Links.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index 80b4fbc..2ba9ae5 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -1,7 +1,7 @@
 /*
  * Links.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 12a3f8d..ef993cb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -1,7 +1,7 @@
 /*
  * Links.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
index 14ae0d2..1481166 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -1,7 +1,7 @@
 /*
  * Links.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
index db34ffb..7bca9bd 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -1,7 +1,7 @@
 /*
  * Links.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index be1fb89..0890a25 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -1,7 +1,7 @@
 /*
  * Tell.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
index 92e0e32..c11e23e 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -1,7 +1,7 @@
 /*
  * TellMessagesMgr.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index 9cbd247..0a3136a 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -1,7 +1,7 @@
 /*
  * EntriesMgr.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt
index 0052a0f..c1c4416 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt
@@ -1,7 +1,7 @@
 /*
  * EntryComment.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
index 9596534..cbc6879 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -1,7 +1,7 @@
 /*
  * EntryLink.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index 726f5e2..3448fa8 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -1,7 +1,7 @@
 /*
  * AbstractModule.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
index 5795480..31c928f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -1,7 +1,7 @@
 /*
  * Calc.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 96534a8..9542395 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -1,7 +1,7 @@
 /*
  * CurrencyConverter.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
index fb20e9d..42eb680 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -1,7 +1,7 @@
 /*
  * Dice.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index a801f55..eeff387 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -1,7 +1,7 @@
 /*
  * GoogleSearch.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
index 9743441..8ac1786 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -1,7 +1,7 @@
 /*
  * Joke.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
index 71a3037..150888b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -1,7 +1,7 @@
 /*
  * Lookup.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
index 470a453..ecfdf47 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
@@ -1,7 +1,7 @@
 /*
  * Ping.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 940c3a7..cb8a825 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -1,7 +1,7 @@
 /*
  * RockPaperScissors.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
index e9c2905..f8e1a8f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -1,7 +1,7 @@
 /*
  * StockQuote.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt b/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
index 97a07e5..44a5e24 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
@@ -1,7 +1,7 @@
 /*
  * ThreadedModule.java
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
index beb3793..a479fd1 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -1,7 +1,7 @@
 /*
  * Twitter.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 2cfe28e..af9e1d4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -1,7 +1,7 @@
 /*
  * War.java
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
index 5a164b5..23f9665 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -1,7 +1,7 @@
 /*
  * Weather2.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
index e1f11c3..ccda94b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -1,7 +1,7 @@
 /*
  * WorldTime.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
index 9987bd8..6cdf592 100644
--- a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
@@ -1,7 +1,7 @@
 /*
  * Message.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt b/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
index 564b7fb..0c7095e 100644
--- a/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
@@ -1,7 +1,7 @@
 /*
  * LocalProperties.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index 5f58c91..d8ec28c 100644
--- a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -1,7 +1,7 @@
 /*
  * PinboardUtilsTest.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index 57cdb46..80dd85b 100644
--- a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -1,7 +1,7 @@
 /*
  * TellMessageTest.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
index 7e710f0..a7d3264 100644
--- a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -1,7 +1,7 @@
 /*
  * EntryLinkTest.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
index 6cc59a5..5a194a6 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
@@ -1,7 +1,7 @@
 /*
  * DiceTest.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index 6797682..4394ceb 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -1,7 +1,7 @@
 /*
  * GoogleSearchTest.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
index 1c71cb0..bad8ca4 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
@@ -1,7 +1,7 @@
 /*
  * RockPaperScissorsTest.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index 24d91d5..36c1680 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -1,7 +1,7 @@
 /*
  * StockQuoteTest.kt
  *
- * Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/version.properties b/version.properties
index cffabaf..1e1926e 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Apr 26 22:03:01 PDT 2021
-version.buildmeta=474
+#Mon Apr 26 22:11:16 PDT 2021
+version.buildmeta=475
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+474
+version.semver=0.8.0-beta+475

From 2f4e6bdb2d5e9fff94aea29e87efa918054d939b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 27 Apr 2021 11:38:08 -0700
Subject: [PATCH 128/262] Cleaned up null-safety checks.

---
 src/main/java/net/thauvin/erik/mobibot/Utils.kt             | 4 +---
 src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt | 4 ++--
 src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt         | 2 ++
 version.properties                                          | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
index a549ac3..d5c3486 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Utils.kt
@@ -86,9 +86,7 @@ object Utils {
      * Capitalize a string.
      */
     @JvmStatic
-    fun capitalize(s: String?): String {
-        return s!!.replaceFirstChar { it.uppercase() }
-    }
+    fun capitalize(s: String?): String? = s?.replaceFirstChar { it.uppercase() }
     
     /**
      * Colorize a string.
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
index cbc6879..08d10e7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -152,8 +152,8 @@ class EntryLink : Serializable {
      * Sets a comment.
      */
     fun setComment(index: Int, comment: String?, nick: String?) {
-        if (index < comments.size) {
-            comments[index] = EntryComment(comment!!, nick!!)
+        if (index < comments.size && (comment != null) && !nick.isNullOrBlank()) {
+            comments[index] = EntryComment(comment, nick)
         }
     }
 
diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
index f62663d..145ae7a 100644
--- a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -82,6 +82,8 @@ class UtilsTest {
     fun testCapitalize() {
         Assertions.assertThat(capitalize("test")).`as`("capitalize(test)").isEqualTo("Test")
         Assertions.assertThat(capitalize("Test")).`as`("capitalize(Test)").isEqualTo("Test")
+        Assertions.assertThat(capitalize(null)).`as`("captitalize(null)").isNull()
+        Assertions.assertThat(capitalize("")).`as`("capitalize()").isEqualTo("")
     }
 
     @Test
diff --git a/version.properties b/version.properties
index 1e1926e..8e5338f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Apr 26 22:11:16 PDT 2021
-version.buildmeta=475
+#Tue Apr 27 17:59:17 PDT 2021
+version.buildmeta=487
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+475
+version.semver=0.8.0-beta+487

From 21cbecff8e29ea1a67eec0357e68ef541a5e8afa Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 28 Apr 2021 08:23:14 -0700
Subject: [PATCH 129/262] Cleanup tests.

---
 .../net/thauvin/erik/mobibot/UtilsTest.kt     | 66 +++++++++----------
 .../mobibot/commands/tell/TellMessageTest.kt  | 22 +++----
 .../erik/mobibot/entries/EntryLinkTest.kt     | 22 +++----
 .../thauvin/erik/mobibot/modules/CalcTest.kt  | 14 ++--
 .../mobibot/modules/CurrencyConverterTest.kt  | 16 ++---
 .../thauvin/erik/mobibot/modules/DiceTest.kt  | 12 +---
 .../erik/mobibot/modules/GoogleSearchTest.kt  | 17 ++---
 .../thauvin/erik/mobibot/modules/JokeTest.kt  |  6 +-
 .../erik/mobibot/modules/LookupTest.kt        |  6 +-
 .../thauvin/erik/mobibot/modules/PingTest.kt  |  6 +-
 .../mobibot/modules/RockPaperScissorsTest.kt  | 29 +++-----
 .../erik/mobibot/modules/StockQuoteTest.kt    | 18 +++--
 .../erik/mobibot/modules/TwitterTest.kt       |  4 +-
 .../erik/mobibot/modules/Weather2Test.kt      | 17 ++---
 .../erik/mobibot/modules/WordTimeTest.kt      |  8 +--
 version.properties                            |  6 +-
 16 files changed, 120 insertions(+), 149 deletions(-)

diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
index 145ae7a..8a33943 100644
--- a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -48,7 +48,7 @@ import net.thauvin.erik.mobibot.Utils.uptime
 import net.thauvin.erik.mobibot.Utils.urlReader
 import net.thauvin.erik.mobibot.Utils.utcDateTime
 import org.apache.commons.lang3.StringUtils
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.jibble.pircbot.Colors
 import org.testng.annotations.BeforeClass
 import org.testng.annotations.Test
@@ -74,108 +74,106 @@ class UtilsTest {
 
     @Test
     fun testBold() {
-        Assertions.assertThat(bold(1)).`as`("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
-        Assertions.assertThat(bold(ascii)).`as`("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+        assertThat(bold(1)).`as`("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
+        assertThat(bold(ascii)).`as`("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
     }
 
     @Test
     fun testCapitalize() {
-        Assertions.assertThat(capitalize("test")).`as`("capitalize(test)").isEqualTo("Test")
-        Assertions.assertThat(capitalize("Test")).`as`("capitalize(Test)").isEqualTo("Test")
-        Assertions.assertThat(capitalize(null)).`as`("captitalize(null)").isNull()
-        Assertions.assertThat(capitalize("")).`as`("capitalize()").isEqualTo("")
+        assertThat(capitalize("test")).`as`("capitalize(test)").isEqualTo("Test")
+        assertThat(capitalize("Test")).`as`("capitalize(Test)").isEqualTo("Test")
+        assertThat(capitalize(null)).`as`("captitalize(null)").isNull()
+        assertThat(capitalize("")).`as`("capitalize()").isEqualTo("")
     }
 
     @Test
     fun testColorize() {
-        Assertions.assertThat(colorize(ascii, Colors.REVERSE)).`as`("colorize(reverse)").isEqualTo(
+        assertThat(colorize(ascii, Colors.REVERSE)).`as`("colorize(reverse)").isEqualTo(
             Colors.REVERSE + ascii + Colors.REVERSE
         )
-        Assertions.assertThat(colorize(ascii, Colors.RED)).`as`("colorize(red)")
-            .isEqualTo(Colors.RED + ascii + Colors.NORMAL)
-        Assertions.assertThat(colorize(null, Colors.RED)).`as`("colorize(null)").isEqualTo(Colors.NORMAL)
+        assertThat(colorize(ascii, Colors.RED)).`as`("colorize(red)").isEqualTo(Colors.RED + ascii + Colors.NORMAL)
+        assertThat(colorize(null, Colors.RED)).`as`("colorize(null)").isEqualTo(Colors.NORMAL)
     }
 
     @Test
     fun testCyan() {
-        Assertions.assertThat(cyan(ascii)).isEqualTo(Colors.CYAN + ascii + Colors.NORMAL)
+        assertThat(cyan(ascii)).isEqualTo(Colors.CYAN + ascii + Colors.NORMAL)
     }
 
     @Test
     fun testEnsureDir() {
-        Assertions.assertThat(ensureDir("dir", false)).`as`("ensureDir(dir, false)")
-            .isEqualTo("dir" + File.separatorChar)
-        Assertions.assertThat(ensureDir("https://erik.thauvin.net", true)).`as`("ensureDir(erik.thauvin.net, true)")
+        assertThat(ensureDir("dir", false)).`as`("ensureDir(dir, false)").isEqualTo("dir" + File.separatorChar)
+        assertThat(ensureDir("https://erik.thauvin.net", true)).`as`("ensureDir(erik.thauvin.net, true)")
             .isEqualTo("https://erik.thauvin.net/")
     }
 
     @Test
     fun testGetIntProperty() {
-        Assertions.assertThat(getIntProperty("10", 1)).`as`("getIntProperty(10, 1)").isEqualTo(10)
-        Assertions.assertThat(getIntProperty("a", 1)).`as`("getIntProperty(a, 1)").isEqualTo(1)
+        assertThat(getIntProperty("10", 1)).`as`("getIntProperty(10, 1)").isEqualTo(10)
+        assertThat(getIntProperty("a", 1)).`as`("getIntProperty(a, 1)").isEqualTo(1)
     }
 
     @Test
     fun testGreen() {
-        Assertions.assertThat(green(ascii)).isEqualTo(Colors.DARK_GREEN + ascii + Colors.NORMAL)
+        assertThat(green(ascii)).isEqualTo(Colors.DARK_GREEN + ascii + Colors.NORMAL)
     }
 
     @Test
     fun testIsoLocalDate() {
-        Assertions.assertThat(isoLocalDate(cal.time)).`as`("isoLocalDate(date)").isEqualTo("1952-02-17")
-        Assertions.assertThat(isoLocalDate(localDateTime)).`as`("isoLocalDate(localDate)").isEqualTo("1952-02-17")
+        assertThat(isoLocalDate(cal.time)).`as`("isoLocalDate(date)").isEqualTo("1952-02-17")
+        assertThat(isoLocalDate(localDateTime)).`as`("isoLocalDate(localDate)").isEqualTo("1952-02-17")
     }
 
     @Test
     fun testObfuscate() {
-        Assertions.assertThat(obfuscate(ascii).length).`as`("obfuscate is right length").isEqualTo(ascii.length)
-        Assertions.assertThat(obfuscate(ascii)).`as`("obfuscate()").isEqualTo(StringUtils.repeat("x", ascii.length))
-        Assertions.assertThat(obfuscate(" ")).`as`("obfuscate(blank)").isEqualTo(" ")
+        assertThat(obfuscate(ascii).length).`as`("obfuscate is right length").isEqualTo(ascii.length)
+        assertThat(obfuscate(ascii)).`as`("obfuscate()").isEqualTo(StringUtils.repeat("x", ascii.length))
+        assertThat(obfuscate(" ")).`as`("obfuscate(blank)").isEqualTo(" ")
     }
 
     @Test
     fun testPlural() {
         val week = "week"
         val weeks = "weeks"
-        Assertions.assertThat(plural(-1, week, weeks)).`as`("plural(-1)").isEqualTo(week)
-        Assertions.assertThat(plural(0, week, weeks)).`as`("plural(0)").isEqualTo(week)
-        Assertions.assertThat(plural(1, week, weeks)).`as`("plural(1)").isEqualTo(week)
-        Assertions.assertThat(plural(2, week, weeks)).`as`("plural(2)").isEqualTo(weeks)
+        assertThat(plural(-1, week, weeks)).`as`("plural(-1)").isEqualTo(week)
+        assertThat(plural(0, week, weeks)).`as`("plural(0)").isEqualTo(week)
+        assertThat(plural(1, week, weeks)).`as`("plural(1)").isEqualTo(week)
+        assertThat(plural(2, week, weeks)).`as`("plural(2)").isEqualTo(weeks)
     }
 
     @Test
     fun testReverseColor() {
-        Assertions.assertThat(reverseColor(ascii)).isEqualTo(Colors.REVERSE + ascii + Colors.REVERSE)
+        assertThat(reverseColor(ascii)).isEqualTo(Colors.REVERSE + ascii + Colors.REVERSE)
     }
 
     @Test
     fun testToday() {
-        Assertions.assertThat(today()).isEqualTo(isoLocalDate(LocalDateTime.now()))
+        assertThat(today()).isEqualTo(isoLocalDate(LocalDateTime.now()))
     }
 
     @Test
     fun testUnescapeXml() {
-        Assertions.assertThat(unescapeXml("&lt;a name=&quot;test &amp; &apos;&#39;&quot;&gt;")).isEqualTo(
+        assertThat(unescapeXml("&lt;a name=&quot;test &amp; &apos;&#39;&quot;&gt;")).isEqualTo(
             "<a name=\"test & ''\">"
         )
     }
 
     @Test
     fun testUptime() {
-        Assertions.assertThat("17 years 2 months 2 weeks 1 day 6 hours 45 minutes").isEqualTo(uptime(547800300076L))
+        assertThat("17 years 2 months 2 weeks 1 day 6 hours 45 minutes").isEqualTo(uptime(547800300076L))
     }
 
     @Test
     @Throws(IOException::class)
     fun testUrlReader() {
-        Assertions.assertThat(urlReader(URL("https://postman-echo.com/status/200"))).`as`("urlReader()").isEqualTo(
+        assertThat(urlReader(URL("https://postman-echo.com/status/200"))).`as`("urlReader()").isEqualTo(
             "{\"status\":200}"
         )
     }
 
     @Test
     fun testUtcDateTime() {
-        Assertions.assertThat(utcDateTime(cal.time)).`as`("utcDateTime(date)").isEqualTo("1952-02-17 12:30")
-        Assertions.assertThat(utcDateTime(localDateTime)).`as`("utcDateTime(localDate)").isEqualTo("1952-02-17 12:30")
+        assertThat(utcDateTime(cal.time)).`as`("utcDateTime(date)").isEqualTo("1952-02-17 12:30")
+        assertThat(utcDateTime(localDateTime)).`as`("utcDateTime(localDate)").isEqualTo("1952-02-17 12:30")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index 80dd85b..f0f0054 100644
--- a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -31,7 +31,7 @@
  */
 package net.thauvin.erik.mobibot.commands.tell
 
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 import java.time.Duration
 import java.time.LocalDateTime
@@ -51,17 +51,17 @@ class TellMessageTest {
         val recipient = "recipient"
         val sender = "sender"
         val tellMessage = TellMessage(sender, recipient, message)
-        Assertions.assertThat(tellMessage.sender).`as`(sender).isEqualTo(sender)
-        Assertions.assertThat(tellMessage.recipient).`as`(recipient).isEqualTo(recipient)
-        Assertions.assertThat(tellMessage.message).`as`(message).isEqualTo(message)
-        Assertions.assertThat(isValidDate(tellMessage.queued)).`as`("queued is valid date/time").isTrue
-        Assertions.assertThat(tellMessage.isMatch(sender)).`as`("match sender").isTrue
-        Assertions.assertThat(tellMessage.isMatch(recipient)).`as`("match recipient").isTrue
-        Assertions.assertThat(tellMessage.isMatch("foo")).`as`("foo is no match").isFalse
+        assertThat(tellMessage.sender).`as`(sender).isEqualTo(sender)
+        assertThat(tellMessage.recipient).`as`(recipient).isEqualTo(recipient)
+        assertThat(tellMessage.message).`as`(message).isEqualTo(message)
+        assertThat(isValidDate(tellMessage.queued)).`as`("queued is valid date/time").isTrue
+        assertThat(tellMessage.isMatch(sender)).`as`("match sender").isTrue
+        assertThat(tellMessage.isMatch(recipient)).`as`("match recipient").isTrue
+        assertThat(tellMessage.isMatch("foo")).`as`("foo is no match").isFalse
         tellMessage.isReceived = true
-        Assertions.assertThat(tellMessage.isReceived).`as`("is received").isTrue
-        Assertions.assertThat(isValidDate(tellMessage.receptionDate)).`as`("received is valid date/time").isTrue
+        assertThat(tellMessage.isReceived).`as`("is received").isTrue
+        assertThat(isValidDate(tellMessage.receptionDate)).`as`("received is valid date/time").isTrue
         tellMessage.isNotified = true
-        Assertions.assertThat(tellMessage.isNotified).`as`("is notified").isTrue
+        assertThat(tellMessage.isNotified).`as`("is notified").isTrue
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
index a7d3264..dcb9378 100644
--- a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.entries
 
 import com.rometools.rome.feed.synd.SyndCategory
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 import java.security.SecureRandom
 
@@ -56,37 +56,37 @@ class EntryLinkTest {
             entryLink.addComment("c$i", "u$i")
             i++
         }
-        Assertions.assertThat(entryLink.comments.size).`as`("getComments().size() == 5").isEqualTo(i)
+        assertThat(entryLink.comments.size).`as`("getComments().size() == 5").isEqualTo(i)
         i = 0
         for (comment in entryLink.comments) {
-            Assertions.assertThat(comment.comment).`as`("getComment($i)").isEqualTo("c$i")
-            Assertions.assertThat(comment.nick).`as`("getNick($i)").isEqualTo("u$i")
+            assertThat(comment.comment).`as`("getComment($i)").isEqualTo("c$i")
+            assertThat(comment.nick).`as`("getNick($i)").isEqualTo("u$i")
             i++
         }
         val r = SecureRandom()
         while (entryLink.comments.size > 0) {
             entryLink.deleteComment(r.nextInt(entryLink.comments.size))
         }
-        Assertions.assertThat(entryLink.comments.isNotEmpty()).`as`("hasComments()").isFalse
+        assertThat(entryLink.comments.isNotEmpty()).`as`("hasComments()").isFalse
         entryLink.addComment("nothing", "nobody")
         entryLink.setComment(0, "something", "somebody")
-        Assertions.assertThat(entryLink.getComment(0).nick).`as`("getNick(somebody)").isEqualTo("somebody")
-        Assertions.assertThat(entryLink.getComment(0).comment).`as`("getComment(something)").isEqualTo("something")
+        assertThat(entryLink.getComment(0).nick).`as`("getNick(somebody)").isEqualTo("somebody")
+        assertThat(entryLink.getComment(0).comment).`as`("getComment(something)").isEqualTo("something")
     }
 
     @Test
     fun testTags() {
         val tags: List<SyndCategory> = entryLink.tags
         for ((i, tag) in tags.withIndex()) {
-            Assertions.assertThat(tag.name).`as`("tag.getName($i)").isEqualTo("tag" + (i + 1))
+            assertThat(tag.name).`as`("tag.getName($i)").isEqualTo("tag" + (i + 1))
         }
-        Assertions.assertThat(entryLink.tags.size).`as`("getTags().size() is 5").isEqualTo(5)
-        Assertions.assertThat(entryLink.tags.isNotEmpty()).`as`("hasTags() is true").isTrue
+        assertThat(entryLink.tags.size).`as`("getTags().size() is 5").isEqualTo(5)
+        assertThat(entryLink.tags.isNotEmpty()).`as`("hasTags() is true").isTrue
         entryLink.setTags("-tag5")
         entryLink.setTags("+mobitopia")
         entryLink.setTags("tag4")
         entryLink.setTags("-mobitopia")
-        Assertions.assertThat(entryLink.pinboardTags).`as`("getPinboardTags()")
+        assertThat(entryLink.pinboardTags).`as`("getPinboardTags()")
             .isEqualTo(entryLink.nick + ",tag1,tag2,tag3,tag4,mobitopia")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.kt
index 643dbd6..45f3848 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -33,7 +33,7 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.modules.Calc.Companion.calc
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
 /**
@@ -42,13 +42,9 @@ import org.testng.annotations.Test
 class CalcTest {
     @Test
     fun testCalc() {
-        Assertions.assertThat(calc("1 + 1")).`as`("calc(1+1)")
-            .isEqualTo("1+1 = %s", Utils.bold(2))
-        Assertions.assertThat(calc("1 -3")).`as`("calc(1 -3)")
-            .isEqualTo("1-3 = %s", Utils.bold(-2))
-        Assertions.assertThat(calc("pi+π+e+φ")).`as`("calc(pi+π+e+φ)")
-            .isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"))
-        Assertions.assertThat(calc("one + one")).`as`("calc(one + one)")
-            .startsWith("No idea.")
+        assertThat(calc("1 + 1")).`as`("calc(1+1)").isEqualTo("1+1 = %s", Utils.bold(2))
+        assertThat(calc("1 -3")).`as`("calc(1 -3)").isEqualTo("1-3 = %s", Utils.bold(-2))
+        assertThat(calc("pi+π+e+φ")).`as`("calc(pi+π+e+φ)").isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"))
+        assertThat(calc("one + one")).`as`("calc(one + one)").startsWith("No idea.")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
index edcbb65..0fbfedd 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
@@ -34,7 +34,7 @@ package net.thauvin.erik.mobibot.modules
 import net.thauvin.erik.mobibot.modules.CurrencyConverter.Companion.convertCurrency
 import net.thauvin.erik.mobibot.modules.CurrencyConverter.Companion.currencyRates
 import net.thauvin.erik.mobibot.modules.CurrencyConverter.Companion.loadRates
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.BeforeClass
 import org.testng.annotations.Test
 
@@ -50,15 +50,11 @@ class CurrencyConverterTest {
 
     @Test
     fun testConvertCurrency() {
-        Assertions.assertThat(convertCurrency("100 USD to EUR").msg)
+        assertThat(convertCurrency("100 USD to EUR").msg)
             .`as`("100 USD to EUR").matches("100\\.00 USD = \\d{2,3}\\.\\d{2} EUR")
-        Assertions.assertThat(convertCurrency("100 USD to USD").msg)
-            .`as`("100 USD to USD").contains("You're kidding, right?")
-        Assertions.assertThat(convertCurrency("100 USD").msg)
-            .`as`("100 USD").contains("Invalid query.")
-        Assertions.assertThat(currencyRates().size)
-            .`as`("currencyRates().size() == 33").isEqualTo(33)
-        Assertions.assertThat(currencyRates())
-            .`as`("currencyRates().get(EUR)").contains("  EUR:        1")
+        assertThat(convertCurrency("100 USD to USD").msg).`as`("100 USD to USD").contains("You're kidding, right?")
+        assertThat(convertCurrency("100 USD").msg).`as`("100 USD").contains("Invalid query.")
+        assertThat(currencyRates().size).`as`("currencyRates().size() == 33").isEqualTo(33)
+        assertThat(currencyRates()).`as`("currencyRates().get(EUR)").contains("  EUR:        1")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
index 5a194a6..cea3e35 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
@@ -39,14 +39,8 @@ import org.testng.annotations.Test
 class DiceTest {
     @Test
     fun testWinLoseOrTie() {
-        assertThat(
-            Dice.winLoseOrTie(6, 6)
-        ).`as`("6 vs. 6").isEqualTo(Dice.Result.TIE)
-        assertThat(
-            Dice.winLoseOrTie(6, 5)
-        ).`as`("6 vs. 5").isEqualTo(Dice.Result.WIN)
-        assertThat(
-            Dice.winLoseOrTie(5, 6)
-        ).`as`("5 vs. 6").isEqualTo(Dice.Result.LOSE)
+        assertThat(Dice.winLoseOrTie(6, 6)).`as`("6 vs. 6").isEqualTo(Dice.Result.TIE)
+        assertThat(Dice.winLoseOrTie(6, 5)).`as`("6 vs. 5").isEqualTo(Dice.Result.WIN)
+        assertThat(Dice.winLoseOrTie(5, 6)).`as`("5 vs. 6").isEqualTo(Dice.Result.LOSE)
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index 4394ceb..c7f0aef 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -33,7 +33,8 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.LocalProperties
 import net.thauvin.erik.mobibot.modules.GoogleSearch.Companion.searchGoogle
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
 
 /**
@@ -47,18 +48,18 @@ class GoogleSearchTest : LocalProperties() {
         val cseKey = getProperty(GoogleSearch.GOOGLE_CSE_KEY_PROP)
         try {
             var messages = searchGoogle("mobibot site:github.com", apiKey, cseKey)
-            Assertions.assertThat(messages).`as`("mobibot results not empty").isNotEmpty
-            Assertions.assertThat(messages[0].msg).`as`("found mobitopia").contains("mobibot")
+            assertThat(messages).`as`("mobibot results not empty").isNotEmpty
+            assertThat(messages[0].msg).`as`("found mobitopia").contains("mobibot")
             messages = searchGoogle("aapl", apiKey, cseKey)
-            Assertions.assertThat(messages).`as`("aapl results not empty").isNotEmpty
-            Assertions.assertThat(messages[0].msg).`as`("found apple").containsIgnoringCase("apple")
-            Assertions.assertThatThrownBy { searchGoogle("test", "", "apiKey") }
+            assertThat(messages).`as`("aapl results not empty").isNotEmpty
+            assertThat(messages[0].msg).`as`("found apple").containsIgnoringCase("apple")
+            assertThatThrownBy { searchGoogle("test", "", "apiKey") }
                 .`as`("no API key")
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
-            Assertions.assertThatThrownBy { searchGoogle("test", "apiKey", "") }
+            assertThatThrownBy { searchGoogle("test", "apiKey", "") }
                 .`as`("no CSE API key")
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
-            Assertions.assertThatThrownBy { searchGoogle("", "apikey", "apiKey") }
+            assertThatThrownBy { searchGoogle("", "apikey", "apiKey") }
                 .`as`("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.kt
index 5a2f221..36156e2 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.modules.Joke.Companion.randomJoke
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
 /**
@@ -42,7 +42,7 @@ class JokeTest {
     @Test
     @Throws(ModuleException::class)
     fun testRamdomJoke() {
-        Assertions.assertThat(randomJoke().msg.isNotEmpty()).`as`("randomJoke() > 0").isTrue
-        Assertions.assertThat(randomJoke().msg).`as`("randomJoke()").containsIgnoringCase("chuck")
+        assertThat(randomJoke().msg.isNotEmpty()).`as`("randomJoke() > 0").isTrue
+        assertThat(randomJoke().msg).`as`("randomJoke()").containsIgnoringCase("chuck")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
index fdbb51c..b623d83 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -33,7 +33,7 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.modules.Lookup.Companion.lookup
 import net.thauvin.erik.mobibot.modules.Lookup.Companion.whois
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
 /**
@@ -44,14 +44,14 @@ class LookupTest {
     @Throws(Exception::class)
     fun testLookup() {
         val result = lookup("apple.com")
-    Assertions.assertThat(result).`as`("lookup(apple.com)").contains("17.253.144.10")
+        assertThat(result).`as`("lookup(apple.com)").contains("17.253.144.10")
     }
 
     @Test
     @Throws(Exception::class)
     fun testWhois() {
         val result = whois("17.178.96.59", Lookup.WHOIS_HOST)
-        Assertions.assertThat(result.stream().anyMatch { m: String -> m.contains("Apple Inc.") })
+        assertThat(result.stream().anyMatch { m: String -> m.contains("Apple Inc.") })
             .`as`("whois(17.178.96.59/Apple Inc.").isTrue
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.kt
index 1b0c460..b849192 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.modules.Ping.Companion.randomPing
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
 /**
@@ -41,13 +41,13 @@ import org.testng.annotations.Test
 class PingTest {
     @Test
     fun testPingsArray() {
-        Assertions.assertThat(Ping.PINGS).`as`("Pings array is not empty.").isNotEmpty
+        assertThat(Ping.PINGS).`as`("Pings array is not empty.").isNotEmpty
     }
 
     @Test
     fun testRandomPing() {
         for (i in 0..9) {
-            Assertions.assertThat(randomPing()).`as`("Random ping $i").isIn(Ping.PINGS)
+            assertThat(randomPing()).`as`("Random ping $i").isIn(Ping.PINGS)
         }
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
index bad8ca4..34cf7bb 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
@@ -38,26 +38,13 @@ import org.testng.annotations.Test
 class RockPaperScissorsTest {
     @Test
     fun testWinLoseOrDraw() {
-        assertThat(
-            RockPaperScissors.winLoseOrDraw("scissors", "paper")
-        ).`as`("scissors vs. paper").isEqualTo("win")
-        assertThat(
-            RockPaperScissors.winLoseOrDraw("paper", "rock")
-        ).`as`("paper vs. rock").isEqualTo("win")
-        assertThat(
-            RockPaperScissors.winLoseOrDraw("rock", "scissors")
-        ).`as`("rock vs. scissors").isEqualTo("win")
-        assertThat(
-            RockPaperScissors.winLoseOrDraw("paper", "scissors")
-        ).`as`("paper vs. scissors").isEqualTo("lose")
-        assertThat(
-            RockPaperScissors.winLoseOrDraw("rock", "paper")
-        ).`as`("rock vs. paper").isEqualTo("lose")
-        assertThat(
-            RockPaperScissors.winLoseOrDraw("scissors", "rock")
-        ).`as`("scissors vs. rock").isEqualTo("lose")
-        assertThat(
-            RockPaperScissors.winLoseOrDraw("scissors", "scissors")
-        ).`as`("scissors vs. scissors").isEqualTo("draw")
+        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "paper")).`as`("scissors vs. paper").isEqualTo("win")
+        assertThat(RockPaperScissors.winLoseOrDraw("paper", "rock")).`as`("paper vs. rock").isEqualTo("win")
+        assertThat(RockPaperScissors.winLoseOrDraw("rock", "scissors")).`as`("rock vs. scissors").isEqualTo("win")
+        assertThat(RockPaperScissors.winLoseOrDraw("paper", "scissors")).`as`("paper vs. scissors").isEqualTo("lose")
+        assertThat(RockPaperScissors.winLoseOrDraw("rock", "paper")).`as`("rock vs. paper").isEqualTo("lose")
+        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "rock")).`as`("scissors vs. rock").isEqualTo("lose")
+        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "scissors"))
+            .`as`("scissors vs. scissors").isEqualTo("draw")
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index 36c1680..5053d22 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -33,7 +33,8 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.LocalProperties
 import net.thauvin.erik.mobibot.modules.StockQuote.Companion.getQuote
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
 
 /**
@@ -46,20 +47,17 @@ class StockQuoteTest : LocalProperties() {
         val apiKey = getProperty(StockQuote.ALPHAVANTAGE_API_KEY_PROP)
         try {
             val messages = getQuote("apple inc", apiKey)
-            Assertions.assertThat(messages).`as`("response not empty").isNotEmpty
-            Assertions.assertThat(messages[0].msg).`as`("same stock symbol")
-                .startsWith("Symbol: AAPL")
-            Assertions.assertThat(messages[1].msg).`as`("price label")
-                .startsWith("    Price:     ")
+            assertThat(messages).`as`("response not empty").isNotEmpty
+            assertThat(messages[0].msg).`as`("same stock symbol").startsWith("Symbol: AAPL")
+            assertThat(messages[1].msg).`as`("price label").startsWith("    Price:     ")
             try {
                 getQuote("blahfoo", apiKey)
             } catch (e: ModuleException) {
-                Assertions.assertThat(e.message).`as`("invalid symbol")
-                    .containsIgnoringCase(StockQuote.INVALID_SYMBOL)
+                assertThat(e.message).`as`("invalid symbol").containsIgnoringCase(StockQuote.INVALID_SYMBOL)
             }
-            Assertions.assertThatThrownBy { getQuote("test", "") }.`as`("no API key")
+            assertThatThrownBy { getQuote("test", "") }.`as`("no API key")
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
-            Assertions.assertThatThrownBy { getQuote("", "apikey") }.`as`("no symbol")
+            assertThatThrownBy { getQuote("", "apikey") }.`as`("no symbol")
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.kt
index da9b26a..4c309c6 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.kt
@@ -33,7 +33,7 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.LocalProperties
 import net.thauvin.erik.mobibot.modules.Twitter.Companion.twitterPost
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 import java.net.InetAddress
 import java.net.UnknownHostException
@@ -56,7 +56,7 @@ class TwitterTest : LocalProperties() {
     @Throws(ModuleException::class)
     fun testPostTwitter() {
         val msg = "Testing Twitter API from $ci"
-        Assertions.assertThat(
+        assertThat(
             twitterPost(
                 getProperty(Twitter.CONSUMER_KEY_PROP),
                 getProperty(Twitter.CONSUMER_SECRET_PROP),
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt
index 4364585..0d9570c 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt
@@ -34,7 +34,8 @@ package net.thauvin.erik.mobibot.modules
 import net.aksingh.owmjapis.api.APIException
 import net.thauvin.erik.mobibot.LocalProperties
 import net.thauvin.erik.mobibot.modules.Weather2.Companion.getWeather
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
 
 /**
@@ -45,16 +46,16 @@ class Weather2Test : LocalProperties() {
     @Throws(ModuleException::class)
     fun testWeather() {
         var messages = getWeather("98204", getProperty(Weather2.OWM_API_KEY_PROP))
-        Assertions.assertThat(messages[0].msg).`as`("is Everett").contains("Everett").contains("US")
-        Assertions.assertThat(messages[messages.size - 1].msg).`as`("is City Search").endsWith("98204%2CUS")
+        assertThat(messages[0].msg).`as`("is Everett").contains("Everett").contains("US")
+        assertThat(messages[messages.size - 1].msg).`as`("is City Search").endsWith("98204%2CUS")
         messages = getWeather("London, UK", getProperty(Weather2.OWM_API_KEY_PROP))
-        Assertions.assertThat(messages[0].msg).`as`("is UK").contains("London").contains("UK")
-        Assertions.assertThat(messages[messages.size - 1].msg).`as`("is City Code").endsWith("4517009")
-        Assertions.assertThatThrownBy { getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP)) }
+        assertThat(messages[0].msg).`as`("is UK").contains("London").contains("UK")
+        assertThat(messages[messages.size - 1].msg).`as`("is City Code").endsWith("4517009")
+        assertThatThrownBy { getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP)) }
             .`as`("Montpellier not found").hasCauseInstanceOf(APIException::class.java)
-        Assertions.assertThatThrownBy { getWeather("test", "") }
+        assertThatThrownBy { getWeather("test", "") }
             .`as`("no API key").isInstanceOf(ModuleException::class.java).hasNoCause()
         messages = getWeather("", "apikey")
-        Assertions.assertThat(messages[0].isError).`as`("no query").isTrue
+        assertThat(messages[0].isError).`as`("no query").isTrue
     }
 }
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index b6a40aa..dd696c9 100644
--- a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -33,7 +33,7 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Utils
 import net.thauvin.erik.mobibot.modules.WorldTime.Companion.worldTime
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
 /**
@@ -42,8 +42,8 @@ import org.testng.annotations.Test
 class WordTimeTest {
     @Test
     fun testWorldTime() {
-        Assertions.assertThat(worldTime("PST").msg).`as`("PST").endsWith(Utils.bold("Los Angeles"))
-        Assertions.assertThat(worldTime("BLAH").isError).`as`("BLAH").isTrue
-        Assertions.assertThat(worldTime("BEATS").msg).`as`("BEATS").contains("@")
+        assertThat(worldTime("PST").msg).`as`("PST").endsWith(Utils.bold("Los Angeles"))
+        assertThat(worldTime("BLAH").isError).`as`("BLAH").isTrue
+        assertThat(worldTime("BEATS").msg).`as`("BEATS").contains("@")
     }
 }
diff --git a/version.properties b/version.properties
index 8e5338f..bf0ed79 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Apr 27 17:59:17 PDT 2021
-version.buildmeta=487
+#Wed Apr 28 08:21:37 PDT 2021
+version.buildmeta=494
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+487
+version.semver=0.8.0-beta+494

From b8cecdad1daa61c80b6cb19ba5eeddc2dbd34a8e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 28 Apr 2021 17:37:05 -0700
Subject: [PATCH 130/262] Cleanup.

---
 src/main/java/net/thauvin/erik/mobibot/Addons.kt            | 4 +---
 src/main/java/net/thauvin/erik/mobibot/commands/Info.java   | 2 +-
 .../java/net/thauvin/erik/mobibot/commands/Versions.java    | 2 +-
 version.properties                                          | 6 +++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
index 7651d91..72f4dcd 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/java/net/thauvin/erik/mobibot/Addons.kt
@@ -98,11 +98,9 @@ class Addons {
             }
         }
         for (module in modules) {
-            if ((isPrivate && module.isPrivateMsgEnabled) || !isPrivate) {
-                if (module.commands.contains(cmd)) {
+            if (((isPrivate && module.isPrivateMsgEnabled) || !isPrivate) && module.commands.contains(cmd)) {
                     module.commandResponse(sender, cmd, args, isPrivate)
                     return true
-                }
             }
         }
         return false
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
index b758885..8597c8c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
@@ -1,5 +1,5 @@
 /*
- * InfoJ.java
+ * Info.java
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
index 685684f..a86493f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
@@ -1,5 +1,5 @@
 /*
- * Version.java
+ * Versions.java
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/version.properties b/version.properties
index bf0ed79..8936e89 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed Apr 28 08:21:37 PDT 2021
-version.buildmeta=494
+#Wed Apr 28 17:17:23 PDT 2021
+version.buildmeta=498
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+494
+version.semver=0.8.0-beta+498

From 2c78d713eb63a58c7527efb1782650a8ece782bf Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 28 Apr 2021 19:50:29 -0700
Subject: [PATCH 131/262] Using Jacoco snapshot. Using src/main/java and
 src/main/kotlin.

---
 build.gradle                                                | 5 +++--
 .../{java => kotlin}/net/thauvin/erik/mobibot/Addons.kt     | 0
 .../{java => kotlin}/net/thauvin/erik/mobibot/Constants.kt  | 0
 .../{java => kotlin}/net/thauvin/erik/mobibot/FeedReader.kt | 0
 .../{java => kotlin}/net/thauvin/erik/mobibot/Mobibot.kt    | 0
 .../net/thauvin/erik/mobibot/PinboardUtils.kt               | 0
 .../net/thauvin/erik/mobibot/TwitterTimer.kt                | 0
 src/main/{java => kotlin}/net/thauvin/erik/mobibot/Utils.kt | 0
 .../net/thauvin/erik/mobibot/commands/AbstractCommand.kt    | 0
 .../net/thauvin/erik/mobibot/commands/AddLog.kt             | 0
 .../net/thauvin/erik/mobibot/commands/ChannelFeed.kt        | 0
 .../net/thauvin/erik/mobibot/commands/Cycle.kt              | 0
 .../net/thauvin/erik/mobibot/commands/Debug.kt              | 0
 .../net/thauvin/erik/mobibot/commands/Ignore.kt             | 0
 .../net/thauvin/erik/mobibot/commands/Me.kt                 | 0
 .../net/thauvin/erik/mobibot/commands/Modules.kt            | 0
 .../net/thauvin/erik/mobibot/commands/Msg.kt                | 0
 .../net/thauvin/erik/mobibot/commands/Nick.kt               | 0
 .../net/thauvin/erik/mobibot/commands/Recap.kt              | 0
 .../net/thauvin/erik/mobibot/commands/Say.kt                | 0
 .../net/thauvin/erik/mobibot/commands/Users.kt              | 0
 .../net/thauvin/erik/mobibot/commands/links/Comment.kt      | 0
 .../net/thauvin/erik/mobibot/commands/links/LinksMgr.kt     | 0
 .../net/thauvin/erik/mobibot/commands/links/Posting.kt      | 0
 .../net/thauvin/erik/mobibot/commands/links/Tags.kt         | 0
 .../net/thauvin/erik/mobibot/commands/links/View.kt         | 0
 .../net/thauvin/erik/mobibot/commands/tell/Tell.kt          | 0
 .../net/thauvin/erik/mobibot/commands/tell/TellMessage.kt   | 0
 .../thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt   | 0
 .../net/thauvin/erik/mobibot/entries/EntriesMgr.kt          | 0
 .../net/thauvin/erik/mobibot/entries/EntriesUtils.kt        | 0
 .../net/thauvin/erik/mobibot/entries/EntryComment.kt        | 0
 .../net/thauvin/erik/mobibot/entries/EntryLink.kt           | 0
 .../net/thauvin/erik/mobibot/modules/AbstractModule.kt      | 0
 .../net/thauvin/erik/mobibot/modules/Calc.kt                | 0
 .../net/thauvin/erik/mobibot/modules/CurrencyConverter.kt   | 0
 .../net/thauvin/erik/mobibot/modules/Dice.kt                | 0
 .../net/thauvin/erik/mobibot/modules/GoogleSearch.kt        | 0
 .../net/thauvin/erik/mobibot/modules/Joke.kt                | 0
 .../net/thauvin/erik/mobibot/modules/Lookup.kt              | 0
 .../net/thauvin/erik/mobibot/modules/ModuleException.kt     | 0
 .../net/thauvin/erik/mobibot/modules/Ping.kt                | 0
 .../net/thauvin/erik/mobibot/modules/RockPaperScissors.kt   | 0
 .../net/thauvin/erik/mobibot/modules/StockQuote.kt          | 0
 .../net/thauvin/erik/mobibot/modules/ThreadedModule.kt      | 0
 .../net/thauvin/erik/mobibot/modules/Twitter.kt             | 0
 .../net/thauvin/erik/mobibot/modules/Weather2.kt            | 0
 .../net/thauvin/erik/mobibot/modules/WorldTime.kt           | 0
 .../net/thauvin/erik/mobibot/msg/ErrorMessage.kt            | 0
 .../net/thauvin/erik/mobibot/msg/Message.kt                 | 0
 .../net/thauvin/erik/mobibot/msg/NoticeMessage.kt           | 0
 .../net/thauvin/erik/mobibot/msg/PrivateMessage.kt          | 0
 .../net/thauvin/erik/mobibot/msg/PublicMessage.kt           | 0
 .../net/thauvin/erik/mobibot/LocalProperties.kt             | 0
 .../net/thauvin/erik/mobibot/PinboardUtilsTest.kt           | 0
 .../{java => kotlin}/net/thauvin/erik/mobibot/UtilsTest.kt  | 0
 .../thauvin/erik/mobibot/commands/tell/TellMessageTest.kt   | 0
 .../net/thauvin/erik/mobibot/entries/EntryLinkTest.kt       | 0
 .../net/thauvin/erik/mobibot/modules/CalcTest.kt            | 0
 .../thauvin/erik/mobibot/modules/CurrencyConverterTest.kt   | 0
 .../net/thauvin/erik/mobibot/modules/DiceTest.kt            | 0
 .../net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt    | 0
 .../net/thauvin/erik/mobibot/modules/JokeTest.kt            | 0
 .../net/thauvin/erik/mobibot/modules/LookupTest.kt          | 0
 .../net/thauvin/erik/mobibot/modules/PingTest.kt            | 0
 .../thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt   | 0
 .../net/thauvin/erik/mobibot/modules/StockQuoteTest.kt      | 0
 .../net/thauvin/erik/mobibot/modules/TwitterTest.kt         | 0
 .../net/thauvin/erik/mobibot/modules/Weather2Test.kt        | 0
 .../net/thauvin/erik/mobibot/modules/WordTimeTest.kt        | 0
 version.properties                                          | 6 +++---
 71 files changed, 6 insertions(+), 5 deletions(-)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/Addons.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/Constants.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/FeedReader.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/Mobibot.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/PinboardUtils.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/TwitterTimer.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/Utils.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/AbstractCommand.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/AddLog.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/ChannelFeed.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Cycle.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Debug.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Ignore.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Me.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Modules.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Msg.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Nick.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Recap.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Say.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/Users.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/links/Comment.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/links/Posting.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/links/Tags.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/links/View.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/tell/Tell.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/entries/EntriesMgr.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/entries/EntriesUtils.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/entries/EntryComment.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/entries/EntryLink.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/AbstractModule.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/Calc.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/Dice.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/GoogleSearch.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/Joke.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/Lookup.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/ModuleException.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/Ping.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/StockQuote.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/ThreadedModule.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/Twitter.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/Weather2.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/modules/WorldTime.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/msg/ErrorMessage.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/msg/Message.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/msg/NoticeMessage.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/msg/PrivateMessage.kt (100%)
 rename src/main/{java => kotlin}/net/thauvin/erik/mobibot/msg/PublicMessage.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/LocalProperties.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/PinboardUtilsTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/UtilsTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/CalcTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/DiceTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/JokeTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/LookupTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/PingTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/TwitterTest.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/Weather2Test.kt (100%)
 rename src/test/{java => kotlin}/net/thauvin/erik/mobibot/modules/WordTimeTest.kt (100%)

diff --git a/build.gradle b/build.gradle
index 0644bfb..b7f043f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,6 @@ final def deployDir = 'deploy'
 final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 
 ext.versions = [
-    jacoco  : '0.8.6',
     log4j   : '2.14.1',
     pmd     : '6.34.0',
     spotbugs: '4.2.3'
@@ -31,6 +30,7 @@ repositories {
     mavenLocal()
     mavenCentral()
     jcenter()
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
 }
 
 dependencies {
@@ -170,10 +170,11 @@ sonarqube {
 }
 
 jacoco {
-    toolVersion = versions.jacoco
+    toolVersion = '0.8.7-SNAPSHOT'
 }
 
 jacocoTestReport {
+    dependsOn test
     reports {
         html.enabled = true
         xml.enabled = true
diff --git a/src/main/java/net/thauvin/erik/mobibot/Addons.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/Addons.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/Constants.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/Constants.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/FeedReader.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/Mobibot.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/PinboardUtils.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/Utils.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/AddLog.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Cycle.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Debug.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Debug.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Debug.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Ignore.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Me.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Modules.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Msg.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Nick.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Recap.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Say.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/Users.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/links/Comment.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/links/Posting.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/links/Tags.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/links/View.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/tell/Tell.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/entries/EntryComment.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/entries/EntryLink.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/Calc.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/Dice.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/Joke.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/Lookup.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/ModuleException.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/Ping.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/StockQuote.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/Twitter.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/Weather2.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/modules/WorldTime.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
diff --git a/src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
similarity index 100%
rename from src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt b/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/LocalProperties.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/UtilsTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/DiceTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/LookupTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/PingTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/PingTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
similarity index 100%
rename from src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
diff --git a/version.properties b/version.properties
index 8936e89..2ade38c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed Apr 28 17:17:23 PDT 2021
-version.buildmeta=498
+#Wed Apr 28 19:39:18 PDT 2021
+version.buildmeta=525
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+498
+version.semver=0.8.0-beta+525

From 8a945b2dc6d0a533468e19d5e958a5bcc04ca706 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 29 Apr 2021 19:07:41 -0700
Subject: [PATCH 132/262] Switched to detekt snapshot for now.

---
 build.gradle               | 6 +++---
 config/detekt/baseline.xml | 1 +
 version.properties         | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index b7f043f..65a28a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.38.0'
-    id 'com.github.spotbugs' version '4.7.0'
+    id 'com.github.spotbugs' version '4.7.1'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.16.0'
     id 'jacoco'
@@ -10,7 +10,7 @@ plugins {
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
     id 'org.jetbrains.kotlin.jvm' version '1.5.0'
     id 'org.jetbrains.kotlin.kapt' version '1.5.0'
-    id 'org.sonarqube' version '3.1.1'
+    id 'org.sonarqube' version '3.2.0'
     id 'pmd'
 }
 
@@ -29,7 +29,6 @@ ext.versions = [
 repositories {
     mavenLocal()
     mavenCentral()
-    jcenter()
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
 }
 
@@ -127,6 +126,7 @@ pmd {
 }
 
 detekt {
+    toolVersion = "main-SNAPSHOT"
     ignoreFailures = true // Baseline is incomplete and fails on various CIs, not sure why.
     baseline = file("${projectDir}/config/detekt/baseline.xml")
 }
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 7d83c69..91a5e9c 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -2,6 +2,7 @@
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
+    <ID>ComplexCondition:Addons.kt$Addons$((isPrivate &amp;&amp; module.isPrivateMsgEnabled) || !isPrivate) &amp;&amp; module.commands.contains(cmd)</ID>
     <ID>ComplexMethod:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
     <ID>ComplexMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongMethod:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
diff --git a/version.properties b/version.properties
index 2ade38c..b0273e9 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed Apr 28 19:39:18 PDT 2021
-version.buildmeta=525
+#Thu Apr 29 18:56:59 PDT 2021
+version.buildmeta=526
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+525
+version.semver=0.8.0-beta+526

From f92f7d26b1d5f5a056e4cc719ac0b927e633b897 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 29 Apr 2021 19:59:08 -0700
Subject: [PATCH 133/262] Renamed ReleaseInfo.mustache to version.mustache.
 Added deploy script.

---
 ReleaseInfo.mustache                          | 32 -----------
 deploy.sh                                     | 13 +++++
 .../net/thauvin/erik/mobibot/Mobibot.kt       |  2 +-
 version.mustache                              | 54 +++++++++----------
 version.properties                            |  6 +--
 5 files changed, 42 insertions(+), 65 deletions(-)
 delete mode 100644 ReleaseInfo.mustache
 create mode 100755 deploy.sh

diff --git a/ReleaseInfo.mustache b/ReleaseInfo.mustache
deleted file mode 100644
index b2672e4..0000000
--- a/ReleaseInfo.mustache
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* This file is automatically generated.
-* Do not modify! -- ALL CHANGES WILL BE ERASED!
-*/
-package {{packageName}}
-
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.Instant
-
-/**
-* Provides semantic version information.
-*
-* @author [Semantic Version Annotation Processor](https://github.com/ethauvin/semver)
-*/
-object ReleaseInfo{
-    const val PROJECT = "{{project}}"
-    const val VERSION = "{{version}}"
-  
-    @JvmField
-    val BUILDDATE = LocalDateTime.ofInstant(Instant.ofEpochMilli({{epoch}}L), ZoneId.systemDefault())
-
-    const val MAJOR = {{major}}
-    const val MINOR = {{minor}}
-    const val PATCH = {{patch}}
-    const val BUILDMETA = "{{buildMeta}}"
-    const val PRERELEASE = "{{preRelease}}"
-
-    const val WEBSITE = "https://www.mobitopia.org/mobibot/"
-    const val AUTHOR = "Erik C. Thauvin"
-    const val AUTHOR_URL = "https://erik.thauvin.net/"
-}
diff --git a/deploy.sh b/deploy.sh
new file mode 100755
index 0000000..9ac698d
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+DEPLOYDIR=/home/erik/mobitopia/mobibot
+
+if [ -f "deploy/mobibot.jar" ]
+then
+    /bin/cp deploy/mobibot.jar $DEPLOYDIR
+    rm -rf $DEPLOYDIR/lib/*.jar
+    cp deploy/lib/*.jar $DEPLOYDIR/lib
+    chmod 755 $DEPLOYDIR/*.jar $DEPLOYDIR/lib/*.jar
+else
+    echo "mobibot.jar not found."
+fi
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index a6e4be9..a230ec3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -106,7 +106,7 @@ import kotlin.system.exitProcess
 /**
  * Implements the #mobitopia bot.
  */
-@Version(properties = "version.properties", className = "ReleaseInfo", template = "ReleaseInfo.mustache", type = "kt")
+@Version(properties = "version.properties", className = "ReleaseInfo", template = "version.mustache", type = "kt")
 class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Properties) : PircBot() {
     // Commands and Modules
     private val addons = Addons()
diff --git a/version.mustache b/version.mustache
index a090f01..b2672e4 100644
--- a/version.mustache
+++ b/version.mustache
@@ -1,36 +1,32 @@
 /*
- * This file is automatically generated.
- * Do not modify! -- ALL CHANGES WILL BE ERASED!
- */
-package {{packageName}};
+* This file is automatically generated.
+* Do not modify! -- ALL CHANGES WILL BE ERASED!
+*/
+package {{packageName}}
 
-import java.time.*;
+import java.time.LocalDateTime
+import java.time.ZoneId
+import java.time.Instant
 
 /**
- * Provides semantic version information.
- *
- * @author <a href="https://github.com/ethauvin/semver">Semantic Version Annotation Processor</a>
- */
-public final class {{className}} {
-    public static final String PROJECT = "{{project}}";
-    public static final String VERSION = "{{version}}";
-    public static final LocalDateTime BUILDDATE =
-        LocalDateTime.ofInstant(Instant.ofEpochMilli({{epoch}}L), ZoneId.systemDefault());
+* Provides semantic version information.
+*
+* @author [Semantic Version Annotation Processor](https://github.com/ethauvin/semver)
+*/
+object ReleaseInfo{
+    const val PROJECT = "{{project}}"
+    const val VERSION = "{{version}}"
+  
+    @JvmField
+    val BUILDDATE = LocalDateTime.ofInstant(Instant.ofEpochMilli({{epoch}}L), ZoneId.systemDefault())
 
-    public static final int MAJOR = {{major}};
-    public static final int MINOR = {{minor}};
-    public static final int PATCH = {{patch}};
-    public static final String BUILDMETA = "{{buildMeta}}";
-    public static final String PRERELEASE = "{{preRelease}}";
+    const val MAJOR = {{major}}
+    const val MINOR = {{minor}}
+    const val PATCH = {{patch}}
+    const val BUILDMETA = "{{buildMeta}}"
+    const val PRERELEASE = "{{preRelease}}"
 
-    public static final String WEBSITE = "https://www.mobitopia.org/mobibot/";
-    public static final String AUTHOR = "Erik C. Thauvin";
-    public static final String AUTHOR_URL = "https://erik.thauvin.net/";
-
-    /**
-     * Disables the default constructor.
-     */
-    private {{className}}() {
-        throw new UnsupportedOperationException("Illegal constructor call.");
-    }
+    const val WEBSITE = "https://www.mobitopia.org/mobibot/"
+    const val AUTHOR = "Erik C. Thauvin"
+    const val AUTHOR_URL = "https://erik.thauvin.net/"
 }
diff --git a/version.properties b/version.properties
index b0273e9..4842225 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Thu Apr 29 18:56:59 PDT 2021
-version.buildmeta=526
+#Thu Apr 29 19:35:53 PDT 2021
+version.buildmeta=528
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+526
+version.semver=0.8.0-beta+528

From b58cd6b11e99f45be533533609d61e4adbaa0bd3 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 29 Apr 2021 20:22:39 -0700
Subject: [PATCH 134/262] Moved to OpenJDK 15.0.2

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 20a8cc6..41e99be 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle
         path: build/reports/
 
 jobs:
-  build_gradle_jdk14:
+  build_gradle_jdk15:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:14.0.1
+      - image: cimg/openjdk:15.0.2
 
     <<: *defaults_gradle
 
@@ -51,5 +51,5 @@ workflows:
   gradle:
         jobs:
         - build_gradle_jdk11
-        - build_gradle_jdk14
+        - build_gradle_jdk15
 

From 864bf99c8eb4d84c7fa4e625fea6c43cc57f114f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 1 May 2021 10:38:29 -0700
Subject: [PATCH 135/262] Fixed detekt baseline.

---
 build.gradle               |  1 -
 config/detekt/baseline.xml | 44 ++++++++++++++++++++++++++++++++++++++
 version.properties         |  6 +++---
 3 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 65a28a8..34cd8a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,7 +127,6 @@ pmd {
 
 detekt {
     toolVersion = "main-SNAPSHOT"
-    ignoreFailures = true // Baseline is incomplete and fails on various CIs, not sure why.
     baseline = file("${projectDir}/config/detekt/baseline.xml")
 }
 
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 91a5e9c..263aa71 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -15,6 +15,42 @@
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
     <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
+    <ID>MagicNumber:AddLog.kt$AddLog$4</ID>
+    <ID>MagicNumber:Comment.kt$Comment$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$11</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$4</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$8</ID>
+    <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
+    <ID>MagicNumber:Dice.kt$Dice$7</ID>
+    <ID>MagicNumber:FeedReader.kt$FeedReader$5</ID>
+    <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$10</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$1000L</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$3</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$5</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$8</ID>
+    <ID>MagicNumber:Modules.kt$Modules$7</ID>
+    <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
+    <ID>MagicNumber:Tell.kt$Tell$50</ID>
+    <ID>MagicNumber:Tell.kt$Tell$7</ID>
+    <ID>MagicNumber:Twitter.kt$Twitter$1000L</ID>
+    <ID>MagicNumber:Twitter.kt$Twitter$60L</ID>
+    <ID>MagicNumber:Users.kt$Users$8</ID>
+    <ID>MagicNumber:Utils.kt$Utils$30</ID>
+    <ID>MagicNumber:Utils.kt$Utils$365</ID>
+    <ID>MagicNumber:Utils.kt$Utils$7</ID>
+    <ID>MagicNumber:View.kt$View$8</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$1.60934</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$32</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$5</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$9</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime$17</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3600</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$60</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$86.4</ID>
     <ID>MemberNameEqualsClassName:Calc.kt$Calc.Companion$ @JvmStatic fun calc(query: String): String</ID>
     <ID>MemberNameEqualsClassName:Lookup.kt$Lookup.Companion$ @JvmStatic @Throws(UnknownHostException::class) fun lookup(query: String): String</ID>
     <ID>MemberNameEqualsClassName:WorldTime.kt$WorldTime.Companion$ @JvmStatic fun worldTime(query: String): Message</ID>
@@ -48,5 +84,13 @@
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
     <ID>ThrowsCount:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>TooGenericExceptionCaught:FeedReader.kt$FeedReader$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$ex: Exception</ID>
+    <ID>TooGenericExceptionCaught:StockQuote.kt$StockQuote.Companion$e: NullPointerException</ID>
+    <ID>TooGenericExceptionCaught:Weather2.kt$Weather2.Companion$e: NullPointerException</ID>
+    <ID>TooManyFunctions:Mobibot.kt$Mobibot : PircBot</ID>
+    <ID>TooManyFunctions:Tell.kt$Tell : AbstractCommand</ID>
+    <ID>TooManyFunctions:Utils.kt$Utils$Utils</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/version.properties b/version.properties
index 4842225..e99ce5a 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Thu Apr 29 19:35:53 PDT 2021
-version.buildmeta=528
+#Fri Apr 30 21:34:46 PDT 2021
+version.buildmeta=538
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+528
+version.semver=0.8.0-beta+538

From 67f618da7141991e4cae3ff9c76d813f344bcfce Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 1 May 2021 13:42:12 -0700
Subject: [PATCH 136/262] Updated detekt to 1.7.0-RC1

---
 build.gradle               | 2 +-
 config/detekt/baseline.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 34cd8a7..25c909e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'com.github.ben-manes.versions' version '0.38.0'
     id 'com.github.spotbugs' version '4.7.1'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.16.0'
+    id 'io.gitlab.arturbosch.detekt' version '1.17.0-RC1'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 263aa71..b5b10a7 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -80,6 +80,9 @@
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>SwallowedException:Calc.kt$Calc.Companion$catch (e: IllegalArgumentException) { "No idea. This is the kind of math I don't get." }</ID>
+    <ID>SwallowedException:GoogleSearchTest.kt$GoogleSearchTest$catch (e: ModuleException) { // Avoid displaying api keys in CI logs if ("true" == System.getenv("CI") &amp;&amp; apiKey.isNotBlank() &amp;&amp; cseKey.isNotBlank()) { throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey, cseKey)) } else { throw e } }</ID>
+    <ID>SwallowedException:StockQuoteTest.kt$StockQuoteTest$catch (e: ModuleException) { // Avoid displaying api keys in CI logs if ("true" == System.getenv("CI") &amp;&amp; apiKey.isNotBlank()) { throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey)) } else { throw e } }</ID>
+    <ID>SwallowedException:TwitterTest.kt$TwitterTest$catch (e: UnknownHostException) { "Unknown Host" }</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>

From 9f3dc273f0ab190d7e021718560b66603684b15b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 1 May 2021 21:46:33 -0700
Subject: [PATCH 137/262] Cleanup.

---
 config/detekt/baseline.xml                    |  9 --------
 .../net/thauvin/erik/mobibot/Mobibot.kt       | 18 +++++++--------
 .../net/thauvin/erik/mobibot/modules/Calc.kt  | 22 ++++++++++++-------
 .../thauvin/erik/mobibot/modules/Lookup.kt    |  4 ++--
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  6 ++---
 .../thauvin/erik/mobibot/modules/CalcTest.kt  | 15 ++++++++-----
 .../erik/mobibot/modules/GoogleSearchTest.kt  |  2 +-
 .../erik/mobibot/modules/LookupTest.kt        |  4 ++--
 .../erik/mobibot/modules/StockQuoteTest.kt    |  2 +-
 .../erik/mobibot/modules/TwitterTest.kt       |  2 +-
 .../erik/mobibot/modules/WordTimeTest.kt      | 10 ++++-----
 version.properties                            |  6 ++---
 12 files changed, 49 insertions(+), 51 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index b5b10a7..2080b7b 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -51,9 +51,6 @@
     <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3600</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$60</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$86.4</ID>
-    <ID>MemberNameEqualsClassName:Calc.kt$Calc.Companion$ @JvmStatic fun calc(query: String): String</ID>
-    <ID>MemberNameEqualsClassName:Lookup.kt$Lookup.Companion$ @JvmStatic @Throws(UnknownHostException::class) fun lookup(query: String): String</ID>
-    <ID>MemberNameEqualsClassName:WorldTime.kt$WorldTime.Companion$ @JvmStatic fun worldTime(query: String): Message</ID>
     <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>
@@ -75,14 +72,8 @@
     <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
-    <ID>PrintStackTrace:Mobibot.kt$Mobibot$e</ID>
-    <ID>PrintStackTrace:Mobibot.kt$Mobibot.Companion$e</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
-    <ID>SwallowedException:Calc.kt$Calc.Companion$catch (e: IllegalArgumentException) { "No idea. This is the kind of math I don't get." }</ID>
-    <ID>SwallowedException:GoogleSearchTest.kt$GoogleSearchTest$catch (e: ModuleException) { // Avoid displaying api keys in CI logs if ("true" == System.getenv("CI") &amp;&amp; apiKey.isNotBlank() &amp;&amp; cseKey.isNotBlank()) { throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey, cseKey)) } else { throw e } }</ID>
-    <ID>SwallowedException:StockQuoteTest.kt$StockQuoteTest$catch (e: ModuleException) { // Avoid displaying api keys in CI logs if ("true" == System.getenv("CI") &amp;&amp; apiKey.isNotBlank()) { throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey)) } else { throw e } }</ID>
-    <ID>SwallowedException:TwitterTest.kt$TwitterTest$catch (e: UnknownHostException) { "Unknown Host" }</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index a230ec3..ffa13a5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -202,6 +202,9 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         try {
             connect(ircServer, ircPort)
         } catch (e: Exception) {
+            if (logger.isDebugEnabled) {
+                logger.debug("Unable to connect to $ircServer, will try again.", e)
+            }
             var retries = 0
             while (retries++ < MAX_RECONNECT && !isConnected) {
                 sleep(10)
@@ -212,7 +215,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                         if (logger.isDebugEnabled) {
                             logger.debug("Unable to reconnect to $ircServer, after $MAX_RECONNECT retries.", ex)
                         }
-                        e.printStackTrace(System.err)
+                        System.err.println("An error has occurred while reconnecting; ${ex.message}")
                         exitProcess(1)
                     }
                 }
@@ -528,7 +531,6 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                 commandLine = parser.parse(options, args)
             } catch (e: ParseException) {
                 System.err.println("CLI Parsing failed. Reason: ${e.message}")
-                e.printStackTrace(System.err)
                 exitProcess(1)
             }
             when {
@@ -550,13 +552,11 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                         ).use { fis ->
                             p.load(fis)
                         }
-                    } catch (e: FileNotFoundException) {
+                    } catch (ignore: FileNotFoundException) {
                         System.err.println("Unable to find properties file.")
-                        e.printStackTrace(System.err)
                         exitProcess(1)
-                    } catch (e: IOException) {
+                    } catch (ignore: IOException) {
                         System.err.println("Unable to open properties file.")
-                        e.printStackTrace(System.err)
                         exitProcess(1)
                     }
                     val nickname = p.getProperty("nick", Mobibot::class.java.name.lowercase())
@@ -574,9 +574,8 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                                 ), true
                             )
                             System.setOut(stdout)
-                        } catch (e: IOException) {
+                        } catch (ignore: IOException) {
                             System.err.println("Unable to open output (stdout) log file.")
-                            e.printStackTrace(System.err)
                             exitProcess(1)
                         }
                         try {
@@ -586,9 +585,8 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                                 ), true
                             )
                             System.setErr(stderr)
-                        } catch (e: IOException) {
+                        } catch (ignore: IOException) {
                             System.err.println("Unable to open error (stderr) log file.")
-                            e.printStackTrace(System.err)
                             exitProcess(1)
                         }
                     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
index 31c928f..9704461 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -32,6 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.objecthunter.exp4j.ExpressionBuilder
+import net.objecthunter.exp4j.tokenizer.UnknownFunctionOrVariableException
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 import java.text.DecimalFormat
@@ -47,7 +48,15 @@ class Calc(bot: Mobibot) : AbstractModule(bot) {
         isPrivate: Boolean
     ) {
         if (args.isNotBlank()) {
-            bot.send(calc(args))
+            try {
+                bot.send(calculate(args))
+            } catch (e: IllegalArgumentException) {
+                if (bot.logger.isWarnEnabled) bot.logger.warn("Failed to calcualte: $args", e)
+                bot.send("No idea. This is the kind of math I don't get.")
+            } catch (e: UnknownFunctionOrVariableException) {
+                if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to calcualte: $args", e)
+                bot.send("No idea. I must've some form of Dyscalculia.")
+            }
         } else {
             helpResponse(sender, isPrivate)
         }
@@ -61,14 +70,11 @@ class Calc(bot: Mobibot) : AbstractModule(bot) {
          * Performs a calculation. e.g.: 1 + 1 * 2
          */
         @JvmStatic
-        fun calc(query: String): String {
+        @Throws(IllegalArgumentException::class)
+        fun calculate(query: String): String {
             val decimalFormat = DecimalFormat("#.##")
-            return try {
-                val calc = ExpressionBuilder(query).build()
-                query.replace(" ", "") + " = " + Utils.bold(decimalFormat.format(calc.evaluate()))
-            } catch (e: IllegalArgumentException) {
-                "No idea. This is the kind of math I don't get."
-            }
+            val calc = ExpressionBuilder(query).build()
+            return query.replace(" ", "") + " = " + Utils.bold(decimalFormat.format(calc.evaluate()))
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
index 150888b..6ead8e7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -52,7 +52,7 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
         if (args.matches("(\\S.)+(\\S)+".toRegex())) {
             with(bot) {
                 try {
-                    lookup(args).split(',').forEach {
+                    nslookup(args).split(',').forEach {
                         send(it.trim())
                     }
                 } catch (ignore: UnknownHostException) {
@@ -105,7 +105,7 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
          */
         @JvmStatic
         @Throws(UnknownHostException::class)
-        fun lookup(query: String): String {
+        fun nslookup(query: String): String {
             val buffer = StringBuilder()
             val results = InetAddress.getAllByName(query)
             var hostInfo: String
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index ccda94b..d93f0b1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -68,10 +68,10 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         }
 
         /**
-         * Returns the world time.
+         * Returns the time for the given timezone/city.
          */
         @JvmStatic
-        fun worldTime(query: String): Message {
+        fun time(query: String): Message {
             val tz = COUNTRIES_MAP[(query.substring(query.indexOf(' ') + 1).trim()).uppercase()]
             val response: String = if (tz != null) {
                 if (BEATS_KEYWORD == tz) {
@@ -193,7 +193,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
                 send(sender, "The supported countries/zones are: ", isPrivate)
                 sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, isPrivate = false)
             } else {
-                val msg = worldTime(args)
+                val msg = time(args)
                 if (isPrivate) {
                     send(sender, msg.msg, true)
                 } else {
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
index 45f3848..a397f5a 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -31,9 +31,11 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import net.objecthunter.exp4j.tokenizer.UnknownFunctionOrVariableException
 import net.thauvin.erik.mobibot.Utils
-import net.thauvin.erik.mobibot.modules.Calc.Companion.calc
+import net.thauvin.erik.mobibot.modules.Calc.Companion.calculate
 import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
 
 /**
@@ -41,10 +43,11 @@ import org.testng.annotations.Test
  */
 class CalcTest {
     @Test
-    fun testCalc() {
-        assertThat(calc("1 + 1")).`as`("calc(1+1)").isEqualTo("1+1 = %s", Utils.bold(2))
-        assertThat(calc("1 -3")).`as`("calc(1 -3)").isEqualTo("1-3 = %s", Utils.bold(-2))
-        assertThat(calc("pi+π+e+φ")).`as`("calc(pi+π+e+φ)").isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"))
-        assertThat(calc("one + one")).`as`("calc(one + one)").startsWith("No idea.")
+    fun testCalculate() {
+        assertThat(calculate("1 + 1")).`as`("calculate(1+1)").isEqualTo("1+1 = %s", Utils.bold(2))
+        assertThat(calculate("1 -3")).`as`("calculate(1 -3)").isEqualTo("1-3 = %s", Utils.bold(-2))
+        assertThat(calculate("pi+π+e+φ")).`as`("calculate(pi+π+e+φ)").isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"))
+        assertThatThrownBy { calculate("one + one") }.`as`("calculate(one+one)")
+                        .isInstanceOf(UnknownFunctionOrVariableException::class.java)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index c7f0aef..2dca819 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -64,7 +64,7 @@ class GoogleSearchTest : LocalProperties() {
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
             if ("true" == System.getenv("CI") && apiKey.isNotBlank() && cseKey.isNotBlank()) {
-                throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey, cseKey))
+                throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey, cseKey), e)
             } else {
                 throw e
             }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
index b623d83..3b94181 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -31,7 +31,7 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.modules.Lookup.Companion.lookup
+import net.thauvin.erik.mobibot.modules.Lookup.Companion.nslookup
 import net.thauvin.erik.mobibot.modules.Lookup.Companion.whois
 import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
@@ -43,7 +43,7 @@ class LookupTest {
     @Test
     @Throws(Exception::class)
     fun testLookup() {
-        val result = lookup("apple.com")
+        val result = nslookup("apple.com")
         assertThat(result).`as`("lookup(apple.com)").contains("17.253.144.10")
     }
 
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index 5053d22..c12b33e 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -62,7 +62,7 @@ class StockQuoteTest : LocalProperties() {
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
             if ("true" == System.getenv("CI") && apiKey.isNotBlank()) {
-                throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey))
+                throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey), e)
             } else {
                 throw e
             }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
index 4c309c6..10a9d79 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
@@ -47,7 +47,7 @@ class TwitterTest : LocalProperties() {
             val ciName = System.getenv("CI_NAME")
             return ciName ?: try {
                 InetAddress.getLocalHost().hostName
-            } catch (e: UnknownHostException) {
+            } catch (ignore: UnknownHostException) {
                 "Unknown Host"
             }
         }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index dd696c9..4243383 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Utils
-import net.thauvin.erik.mobibot.modules.WorldTime.Companion.worldTime
+import net.thauvin.erik.mobibot.modules.WorldTime.Companion.time
 import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
@@ -41,9 +41,9 @@ import org.testng.annotations.Test
  */
 class WordTimeTest {
     @Test
-    fun testWorldTime() {
-        assertThat(worldTime("PST").msg).`as`("PST").endsWith(Utils.bold("Los Angeles"))
-        assertThat(worldTime("BLAH").isError).`as`("BLAH").isTrue
-        assertThat(worldTime("BEATS").msg).`as`("BEATS").contains("@")
+    fun testTime() {
+        assertThat(time("PST").msg).`as`("PST").endsWith(Utils.bold("Los Angeles"))
+        assertThat(time("BLAH").isError).`as`("BLAH").isTrue
+        assertThat(time("BEATS").msg).`as`("BEATS").contains("@")
     }
 }
diff --git a/version.properties b/version.properties
index e99ce5a..bff0913 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Apr 30 21:34:46 PDT 2021
-version.buildmeta=538
+#Sat May 01 21:41:40 PDT 2021
+version.buildmeta=568
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+538
+version.semver=0.8.0-beta+568

From d6df365e4b79354e84bb98f361f20b49505baa76 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 3 May 2021 15:29:43 -0700
Subject: [PATCH 138/262] Cleanup.

---
 build.gradle                                  | 23 ++---
 config/detekt/baseline.xml                    | 41 +-------
 .../kotlin/net/thauvin/erik/mobibot/Addons.kt |  5 +-
 .../net/thauvin/erik/mobibot/FeedReader.kt    |  1 +
 .../net/thauvin/erik/mobibot/Mobibot.kt       |  5 +
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  |  2 +
 .../thauvin/erik/mobibot/commands/AddLog.kt   |  1 +
 .../thauvin/erik/mobibot/commands/Cycle.kt    |  1 +
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  1 +
 .../thauvin/erik/mobibot/commands/Modules.kt  |  1 +
 .../thauvin/erik/mobibot/commands/Recap.kt    |  1 +
 .../thauvin/erik/mobibot/commands/Users.kt    |  1 +
 .../erik/mobibot/commands/links/Comment.kt    |  1 +
 .../erik/mobibot/commands/links/View.kt       |  1 +
 .../erik/mobibot/commands/tell/Tell.kt        |  5 +-
 .../erik/mobibot/entries/EntriesMgr.kt        | 93 +++++++++++--------
 .../erik/mobibot/modules/CurrencyConverter.kt |  4 +
 .../net/thauvin/erik/mobibot/modules/Dice.kt  |  1 +
 .../thauvin/erik/mobibot/modules/Twitter.kt   |  1 +
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  2 +
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  3 +
 version.properties                            |  6 +-
 22 files changed, 102 insertions(+), 98 deletions(-)

diff --git a/build.gradle b/build.gradle
index 25c909e..acceb2d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,21 +40,22 @@ dependencies {
     compileOnly 'pircbot:pircbot:1.5.0:sources'
 
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
-
-    implementation 'com.rometools:rome:1.15.0'
-    implementation 'commons-cli:commons-cli:1.4'
-    implementation 'commons-net:commons-net:3.8.0'
-    implementation 'net.aksingh:owm-japis:2.5.3.0'
-    implementation 'net.objecthunter:exp4j:0.4.8'
-    implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-RC'
-    implementation 'org.json:json:20210307'
-    implementation 'org.jsoup:jsoup:1.13.1'
-    implementation 'org.twitter4j:twitter4j-core:4.0.7'
+
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
+    implementation 'commons-cli:commons-cli:1.4'
+    implementation 'commons-net:commons-net:3.8.0'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
+
+    implementation 'com.rometools:rome:1.15.0'
+    implementation 'net.aksingh:owm-japis:2.5.3.0'
+    implementation 'net.objecthunter:exp4j:0.4.8'
+    implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
+    implementation 'org.json:json:20210307'
+    implementation 'org.jsoup:jsoup:1.13.1'
+    implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
     compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
     testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 2080b7b..afd1e14 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -2,7 +2,6 @@
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
-    <ID>ComplexCondition:Addons.kt$Addons$((isPrivate &amp;&amp; module.isPrivateMsgEnabled) || !isPrivate) &amp;&amp; module.commands.contains(cmd)</ID>
     <ID>ComplexMethod:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
     <ID>ComplexMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongMethod:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
@@ -15,49 +14,14 @@
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
     <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
-    <ID>MagicNumber:AddLog.kt$AddLog$4</ID>
-    <ID>MagicNumber:Comment.kt$Comment$3</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$11</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$3</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$3</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$4</ID>
-    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$8</ID>
-    <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
-    <ID>MagicNumber:Dice.kt$Dice$7</ID>
-    <ID>MagicNumber:FeedReader.kt$FeedReader$5</ID>
-    <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$10</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$1000L</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$3</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$5</ID>
-    <ID>MagicNumber:Mobibot.kt$Mobibot$8</ID>
-    <ID>MagicNumber:Modules.kt$Modules$7</ID>
-    <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
-    <ID>MagicNumber:Tell.kt$Tell$50</ID>
-    <ID>MagicNumber:Tell.kt$Tell$7</ID>
-    <ID>MagicNumber:Twitter.kt$Twitter$1000L</ID>
-    <ID>MagicNumber:Twitter.kt$Twitter$60L</ID>
-    <ID>MagicNumber:Users.kt$Users$8</ID>
-    <ID>MagicNumber:Utils.kt$Utils$30</ID>
-    <ID>MagicNumber:Utils.kt$Utils$365</ID>
-    <ID>MagicNumber:Utils.kt$Utils$7</ID>
-    <ID>MagicNumber:View.kt$View$8</ID>
-    <ID>MagicNumber:Weather2.kt$Weather2.Companion$1.60934</ID>
-    <ID>MagicNumber:Weather2.kt$Weather2.Companion$32</ID>
-    <ID>MagicNumber:Weather2.kt$Weather2.Companion$5</ID>
-    <ID>MagicNumber:Weather2.kt$Weather2.Companion$9</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime$17</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3600</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$60</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$86.4</ID>
     <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.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
+    <ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter.Companion$ @Suppress("MagicNumber") @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>
+    <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr$// Daily backup private fun dailyBackup( bot: Mobibot, history: MutableList&lt;String&gt; )</ID>
     <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ private fun setTags(tags: List&lt;String?&gt;)</ID>
     <ID>NestedBlockDepth:FeedReader.kt$FeedReader$ override fun run()</ID>
     <ID>NestedBlockDepth:GoogleSearch.kt$GoogleSearch$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
@@ -85,6 +49,5 @@
     <ID>TooGenericExceptionCaught:Weather2.kt$Weather2.Companion$e: NullPointerException</ID>
     <ID>TooManyFunctions:Mobibot.kt$Mobibot : PircBot</ID>
     <ID>TooManyFunctions:Tell.kt$Tell : AbstractCommand</ID>
-    <ID>TooManyFunctions:Utils.kt$Utils$Utils</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
index 72f4dcd..c2151a0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
@@ -97,8 +97,9 @@ class Addons {
                 return true
             }
         }
-        for (module in modules) {
-            if (((isPrivate && module.isPrivateMsgEnabled) || !isPrivate) && module.commands.contains(cmd)) {
+        val mods = if (isPrivate) modules.filter { it.isPrivateMsgEnabled } else modules
+        for (module in mods) {
+            if (module.commands.contains(cmd)) {
                     module.commandResponse(sender, cmd, args, isPrivate)
                     return true
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index 0cba397..4e20d32 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -48,6 +48,7 @@ class FeedReader(
     private val url: String
 ) : Runnable {
     // Maximum number of feed items to display
+    @Suppress("MagicNumber")
     private val maxItems = 5
 
     /**
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index ffa13a5..bf30f72 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -207,6 +207,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
             }
             var retries = 0
             while (retries++ < MAX_RECONNECT && !isConnected) {
+                @Suppress("MagicNumber")
                 sleep(10)
                 try {
                     connect(ircServer, ircPort)
@@ -240,6 +241,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     /**
      * Responds with the default help.
      */
+    @Suppress("MagicNumber")
     fun helpDefault(sender: String, isOp: Boolean, isPrivate: Boolean) {
         send(sender, "Type a URL on $channel to post it.", isPrivate)
         send(sender, "For more information on a specific command, type:", isPrivate)
@@ -305,6 +307,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         if (weblogUrl.isNotBlank()) {
             version = weblogUrl
         }
+        @Suppress("MagicNumber")
         sleep(5)
         connect()
     }
@@ -361,6 +364,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
             timer.cancel()
             twitter.shutdown()
             twitter.notification("$name stopped by $sender on $channel")
+            @Suppress("MagicNumber")
             sleep(3)
             quitServer("The Bot Is Out There!")
             exitProcess(0)
@@ -467,6 +471,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      */
     fun sleep(secs: Int) {
         try {
+            @Suppress("MagicNumber")
             Thread.sleep(secs * 1000L)
         } catch (ignore: InterruptedException) {
             // Do nothing
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index d5c3486..2304bc0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -51,6 +51,7 @@ import java.util.stream.Collectors
 /**
  * Miscellaneous utilities.
  */
+@Suppress("TooManyFunctions")
 object Utils {
     private val searchFlags = arrayOf("%c", "%n")
 
@@ -234,6 +235,7 @@ object Utils {
     /**
      * Converts milliseconds to year month week day hour and minutes.
      */
+    @Suppress("MagicNumber")
     @JvmStatic
     fun uptime(uptime: Long): String {
         val info = StringBuilder()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
index 261a154..c0c0275 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
@@ -63,6 +63,7 @@ class AddLog(bot: Mobibot) : AbstractCommand(bot) {
                     return
                 }
             }
+            @Suppress("MagicNumber")
             bot.sendList(sender, history, 4, isPrivate, isIndent = true)
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
index a62b87f..32c06e5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -36,6 +36,7 @@ import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
 
 class Cycle(bot: Mobibot) : AbstractCommand(bot) {
+    @Suppress("MagicNumber")
     private val wait = 10
     override val name = "cycle"
     override val help = listOf("To have the bot leave the channel and come back:", Utils.helpFormat("%c $name"))
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
index cdcc77f..cb635f2 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -140,6 +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)
         } else {
             bot.send(sender, "No one is currently ${Utils.bold("ignored")}.", isPrivate)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
index d2d780b..50ddc93 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -58,6 +58,7 @@ class Modules(bot: Mobibot) : AbstractCommand(bot) {
                     send(sender, "There are no enabled modules.", isPrivate)
                 } else {
                     send(sender, "The enabled modules are: ", isPrivate)
+                    @Suppress("MagicNumber")
                     sendList(sender, modulesNames, 7, isPrivate, isIndent = true)
                 }
             } else {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
index 364fc5f..cbcf5d0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -60,6 +60,7 @@ class Recap(bot: Mobibot) : AbstractCommand(bot) {
                 Utils.utcDateTime(LocalDateTime.now(Clock.systemUTC()))
                     + " - $sender" + (if (isAction) " " else ": ") + message
             )
+            @Suppress("MagicNumber")
             if (recaps.size > 10) {
                 recaps.removeAt(0)
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
index 759b54c..1d1ec6e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
@@ -62,6 +62,7 @@ class Users(bot: Mobibot) : AbstractCommand(bot) {
             }
         }
 
+        @Suppress("MagicNumber")
         bot.sendList(sender, nicks.sorted(), 8, isPrivate, isIndent = true)
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 8b55a5d..9a8685a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -65,6 +65,7 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
+        @Suppress("MagicNumber")
         val cmds = args.substring(1).split("[.:]".toRegex(), 3)
         val index = cmds[0].toInt() - 1
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
index 7bca9bd..0627d93 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -40,6 +40,7 @@ import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
 
 class View(bot: Mobibot) : AbstractCommand(bot) {
+    @Suppress("MagicNumber")
     private val maxEntries = 8
     override val name = VIEW_CMD
     override val help = listOf(
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index 0890a25..80b7f79 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -53,9 +53,11 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
     private val serializedObject: String
 
     // Maximum number of days to keep messages
+    @Suppress("MagicNumber")
     private var maxDays = 7
 
     // Message maximum queue size
+    @Suppress("MagicNumber")
     private var maxSize = 50
 
     /**
@@ -227,8 +229,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                             save()
                         }
                     } else if (message.sender.equals(nickname, ignoreCase = true) && message.isReceived
-                        && !message.isNotified
-                    ) {
+                        && !message.isNotified) {
                         bot.send(
                             nickname,
                             "Your message ${reverseColor("[ID " + message.id + ']')} was sent to " +
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index 0a3136a..00fe777 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -71,6 +71,53 @@ object EntriesMgr {
     // Maximum number of backlogs to keep
     private const val maxBacklogs = 10
 
+    // Daily backup
+    private fun dailyBackup(
+        bot: Mobibot,
+        history: MutableList<String>
+    ) {
+        if (bot.backlogsUrl.isNotBlank()) {
+            if (!history.contains(bot.today)) {
+                history.add(bot.today)
+                while (history.size > maxBacklogs) {
+                    history.removeAt(0)
+                }
+            }
+            OutputStreamWriter(
+                Files.newOutputStream(Paths.get(bot.logsDir + NAV_XML)), StandardCharsets.UTF_8
+            ).use { fw ->
+                val output = SyndFeedOutput()
+                val rss: SyndFeed = SyndFeedImpl()
+                val items: MutableList<SyndEntry> = mutableListOf()
+                var item: SyndEntry
+                with(rss) {
+                    feedType = "rss_2.0"
+                    title = "${bot.channel} IRC Links Backlogs"
+                    description = "Backlogs of Links from ${bot.ircServer} on ${bot.channel}"
+                    link = bot.backlogsUrl
+                    publishedDate = Calendar.getInstance().time
+                }
+                var date: String
+                items.clear()
+                for (i in history.size - 1 downTo 0) {
+                    date = history[i]
+                    item = SyndEntryImpl()
+                    with(item) {
+                        link = bot.backlogsUrl + date + ".xml"
+                        title = date
+                        description = SyndContentImpl().apply { value = "Links for $date" }
+                    }
+                    items.add(item)
+                }
+                rss.entries = items
+                if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the backlog feed.")
+                output.output(rss, fw)
+            }
+        } else {
+            bot.logger.warn("Unable to generate the backlogs feed. No property configured.")
+        }
+    }
+
     /**
      * Loads the backlogs.
      */
@@ -139,7 +186,7 @@ object EntriesMgr {
         if (bot.logsDir.isNotBlank() && bot.weblogUrl.isNotBlank()) {
             try {
                 val output = SyndFeedOutput()
-                var rss: SyndFeed = SyndFeedImpl()
+                val rss: SyndFeed = SyndFeedImpl()
                 val items: MutableList<SyndEntry> = mutableListOf()
                 var item: SyndEntry
                 OutputStreamWriter(
@@ -153,12 +200,12 @@ object EntriesMgr {
                         publishedDate = Calendar.getInstance().time
                         language = "en"
                     }
-                    var buff: StringBuilder
+                    val buff: StringBuilder = StringBuilder()
                     var comment: EntryComment
                     for (i in entries.size - 1 downTo 0) {
                         with(entries[i]) {
-                            buff = StringBuilder()
-                                .append("Posted by <b>")
+                            buff.setLength(0)
+                            buff.append("Posted by <b>")
                                 .append(nick)
                                 .append("</b> on <a href=\"irc://")
                                 .append(bot.ircServer).append('/')
@@ -199,43 +246,7 @@ object EntriesMgr {
                     ), StandardCharsets.UTF_8
                 ).use { fw -> output.output(rss, fw) }
                 if (isDayBackup) {
-                    if (bot.backlogsUrl.isNotBlank()) {
-                        if (!history.contains(bot.today)) {
-                            history.add(bot.today)
-                            while (history.size > maxBacklogs) {
-                                history.removeAt(0)
-                            }
-                        }
-                        OutputStreamWriter(
-                            Files.newOutputStream(Paths.get(bot.logsDir + NAV_XML)), StandardCharsets.UTF_8
-                        ).use { fw ->
-                            rss = SyndFeedImpl()
-                            with(rss) {
-                                feedType = "rss_2.0"
-                                title = "${bot.channel} IRC Links Backlogs"
-                                description = "Backlogs of Links from ${bot.ircServer} on ${bot.channel}"
-                                link = bot.backlogsUrl
-                                publishedDate = Calendar.getInstance().time
-                            }
-                            var date: String
-                            items.clear()
-                            for (i in history.size - 1 downTo 0) {
-                                date = history[i]
-                                item = SyndEntryImpl()
-                                with(item) {
-                                    link = bot.backlogsUrl + date + ".xml"
-                                    title = date
-                                    description = SyndContentImpl().apply { value = "Links for $date" }
-                                }
-                                items.add(item)
-                            }
-                            rss.entries = items
-                            if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the backlog feed.")
-                            output.output(rss, fw)
-                        }
-                    } else {
-                        bot.logger.warn("Unable to generate the backlogs feed. No property configured.")
-                    }
+                    dailyBackup(bot, history)
                 }
             } catch (e: FeedException) {
                 if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 9542395..acf3669 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -86,6 +86,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 }
             } else if (args.contains(CURRENCY_RATES_KEYWORD)) {
                 send(sender, "The currency rates for ${Utils.bold(pubDate)} are:", isPrivate)
+                @Suppress("MagicNumber")
                 sendList(sender, currencyRates(), 3, isPrivate, isIndent = true)
             } else {
                 helpResponse(sender, isPrivate)
@@ -122,6 +123,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                     isPrivate
                 )
                 send(sender, "The supported currencies are: ", isPrivate)
+                @Suppress("MagicNumber")
                 sendList(sender, ArrayList(EXCHANGE_RATES.keys), 11, isPrivate, isIndent = true)
             }
         }
@@ -150,6 +152,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         /**
          * Converts from a currency to another.
          */
+        @Suppress("MagicNumber")
         @JvmStatic
         fun convertCurrency(query: String): Message {
             val cmds = query.split(" ")
@@ -185,6 +188,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         fun currencyRates(): List<String> {
             val rates = mutableListOf<String>()
             for ((key, value) in EXCHANGE_RATES) {
+                @Suppress("MagicNumber")
                 rates.add("  $key: ${StringUtils.leftPad(value, 8)}")
             }
             return rates
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 42eb680..53c39ad 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -73,6 +73,7 @@ class Dice(bot: Mobibot) : AbstractModule(bot) {
     }
 
     private fun roll(): Pair<Int, Int> {
+        @Suppress("MagicNumber")
         return Pair(Random.nextInt(1, 7), Random.nextInt(1, 7))
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
index a479fd1..7fdefd4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -145,6 +145,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
             if (bot.logger.isDebugEnabled) {
                 bot.logger.debug("Scheduling {} for posting on Twitter.", EntriesUtils.buildLinkCmd(index))
             }
+            @Suppress("MagicNumber")
             bot.timer.schedule(TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L)
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index 23f9665..8c01cff 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -89,6 +89,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
         }
 
         private fun getTemps(d: Double?): String {
+            @Suppress("MagicNumber")
             val c = (d!! - 32) * 5 / 9
             return "${d.roundToInt()} °F, ${c.roundToInt()} °C"
         }
@@ -186,6 +187,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
         }
 
         private fun wind(w: Double): String {
+            @Suppress("MagicNumber")
             val kmh = w * 1.60934
             return "${w.roundToInt()} mph, ${kmh.roundToInt()} km/h"
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index d93f0b1..0b21462 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -60,6 +60,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         /**
          * Returns the current Internet (beat) Time.
          */
+        @Suppress("MagicNumber")
         private fun internetTime(): String {
             val zdt = ZonedDateTime.now(ZoneId.of("UTC+01:00"))
             val beats = ((zdt[ChronoField.SECOND_OF_MINUTE] + zdt[ChronoField.MINUTE_OF_HOUR] * 60
@@ -171,6 +172,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["ZULU"] = "Zulu"
             countries["INTERNET"] = BEATS_KEYWORD
             countries["BEATS"] = BEATS_KEYWORD
+            @Suppress("MagicNumber")
             ZoneId.getAvailableZoneIds().stream()
                 .filter { tz: String ->
                     !tz.contains("/") && tz.length == 3 && !countries.containsKey(tz)
@@ -191,6 +193,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         with(bot) {
             if (args.isEmpty()) {
                 send(sender, "The supported countries/zones are: ", isPrivate)
+                @Suppress("MagicNumber")
                 sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, isPrivate = false)
             } else {
                 val msg = time(args)
diff --git a/version.properties b/version.properties
index bff0913..9d6cb44 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat May 01 21:41:40 PDT 2021
-version.buildmeta=568
+#Mon May 03 14:17:39 PDT 2021
+version.buildmeta=576
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+568
+version.semver=0.8.0-beta+576

From c99210f624129c2b6abe6fdd5a4c920a8dd1e701 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 May 2021 01:03:33 -0700
Subject: [PATCH 139/262] Added Bitcoin module.

---
 config/detekt/baseline.xml                    |   3 +
 .../net/thauvin/erik/mobibot/Mobibot.kt       |   2 +
 .../thauvin/erik/mobibot/modules/Bitcoin.kt   | 123 ++++++++++++++++++
 .../erik/mobibot/modules/BitcoinTest.kt       |  55 ++++++++
 version.properties                            |   6 +-
 5 files changed, 186 insertions(+), 3 deletions(-)
 create mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index afd1e14..a4065f6 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -15,6 +15,7 @@
     <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
     <ID>NestedBlockDepth:Addons.kt$Addons$ fun add(command: AbstractCommand, props: Properties)</ID>
+    <ID>NestedBlockDepth:Bitcoin.kt$Bitcoin$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</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>
@@ -38,10 +39,12 @@
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
+    <ID>ThrowsCount:Bitcoin.kt$Bitcoin.Companion$ @JvmStatic @Throws(ModuleException::class) fun marketPrice(currency: String): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
     <ID>ThrowsCount:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
+    <ID>TooGenericExceptionCaught:Bitcoin.kt$Bitcoin.Companion$e: NullPointerException</ID>
     <ID>TooGenericExceptionCaught:FeedReader.kt$FeedReader$e: Exception</ID>
     <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$e: Exception</ID>
     <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$ex: Exception</ID>
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index bf30f72..72f0e89 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -64,6 +64,7 @@ import net.thauvin.erik.mobibot.commands.links.View
 import net.thauvin.erik.mobibot.commands.tell.Tell
 import net.thauvin.erik.mobibot.entries.EntriesMgr
 import net.thauvin.erik.mobibot.entries.EntryLink
+import net.thauvin.erik.mobibot.modules.Bitcoin
 import net.thauvin.erik.mobibot.modules.Calc
 import net.thauvin.erik.mobibot.modules.CurrencyConverter
 import net.thauvin.erik.mobibot.modules.Dice
@@ -677,6 +678,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         addons.add(View(this), p)
 
         // Load the modules
+        addons.add(Bitcoin(this), p)
         addons.add(Calc(this), p)
         addons.add(CurrencyConverter(this), p)
         addons.add(Dice(this), p)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
new file mode 100644
index 0000000..0289bf2
--- /dev/null
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
@@ -0,0 +1,123 @@
+/*
+ * Bitcoin.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.msg.ErrorMessage
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.NoticeMessage
+import net.thauvin.erik.mobibot.msg.PublicMessage
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.IOException
+import java.net.URL
+
+/**
+ * The Bitcoin module.
+ */
+class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
+    // Currencies
+    private val currencies = listOf(
+            "USD", "AUD", "BRL", "CAD", "CHF", "CLP", "CNY", "DKK", "EUR", "GBP", "HKD", "INR", "ISK", "JPY", "KRW", 
+            "NZD", "PLN", "RUB", "SEK", "SGD", "THB", "TRY", "TWD");
+
+    /**
+     * Returns the bitcoin market price from [Blockchain.info](https://blockchain.info/ticker).
+     */
+    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+        with(bot) {
+            val arg  = args.trim().uppercase()
+            @Suppress("MagicNumber")
+            if (!currencies.contains(arg)) {
+                helpResponse(sender, isPrivate)
+                send(sender, "The supported currencies are: ", isPrivate)
+                @Suppress("MagicNumber")
+                sendList(sender, currencies, 12, isPrivate, isIndent = true)
+            } else {
+                try {
+                    val messages = marketPrice(arg)
+                    for (msg in messages) {
+                        send(sender, msg)
+                    }
+                } catch (e: ModuleException) {
+                    if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
+                    send(e.message)
+                }
+            }
+        }
+    }
+
+    companion object {
+        // Blockchain Ticker URL
+        private const val TICKER_URL = "https://blockchain.info/ticker"
+
+        // Quote command
+        private const val BITCOIN_CMD = "bitcoin"
+
+        /**
+         * Retrieves the bitcoin market price.
+         */
+        @JvmStatic
+        @Throws(ModuleException::class)
+        fun marketPrice(currency: String): List<Message> {
+            val debugMessage = "marketPrice($currency)"
+            val messages = mutableListOf<Message>()
+            try {
+                val response = Utils.urlReader(URL("$TICKER_URL"))
+                val json = JSONObject(response)
+                val bpi = json.getJSONObject(currency.trim().uppercase())
+                val symbol = bpi.getString("symbol");
+                with(messages) {
+                    add(PublicMessage("BTC: $symbol" + bpi.getBigDecimal("last") + " [$currency]"))
+                    add(NoticeMessage("    15m:     $symbol" + bpi.getBigDecimal("15m")))
+                    add(NoticeMessage("    Buy:     $symbol" + bpi.getBigDecimal("buy")))
+                    add(NoticeMessage("    Sell:    $symbol" + bpi.getBigDecimal("sell")))
+                }
+                return messages
+            } catch (e: IOException) {
+                throw ModuleException(debugMessage, "An IO error has occurred retrieving the bitcoin market price.", e)
+            } catch (e: NullPointerException) {
+                throw ModuleException(debugMessage, "An error has occurred retrieving the bitcoin market price.", e)
+            } catch (e: org.json.JSONException) {
+                throw ModuleException(
+                        debugMessage, "A parsing error has occurred retriving the bitcoin market price.", e)
+            }
+        }
+    }
+
+    init {
+        commands.add(BITCOIN_CMD)
+        help.add("To retrieve the bitcoin market price:")
+        help.add(Utils.helpFormat("%c $BITCOIN_CMD <USD|GBP|EUR|...>"))
+    }
+}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
new file mode 100644
index 0000000..8453420
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
@@ -0,0 +1,55 @@
+/*
+ * BitcoinTest.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import net.thauvin.erik.mobibot.LocalProperties
+import net.thauvin.erik.mobibot.modules.Bitcoin.Companion.marketPrice
+import org.assertj.core.api.Assertions.assertThat
+import org.testng.annotations.Test
+
+/**
+ * The `BitcoinTest` class.
+ */
+class BitcoinTest : LocalProperties() {
+    @Test
+    @Throws(ModuleException::class)
+    fun testMarketPrice() {
+        var messages = marketPrice("USD")
+        assertThat(messages).`as`("not empty").isNotEmpty
+        assertThat(messages[0].msg).`as`("btc & $").startsWith("BTC").contains("$")
+        assertThat(messages[1].msg).`as`("15m").contains("15m")
+
+        messages = marketPrice("GBP")
+        assertThat(messages[0].msg).`as`("BPB btc & £").startsWith("BTC").contains("£")
+        assertThat(messages[1].msg).`as`("GBP 15m").contains("15m")
+    }
+}
diff --git a/version.properties b/version.properties
index 9d6cb44..dcde182 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon May 03 14:17:39 PDT 2021
-version.buildmeta=576
+#Tue May 04 01:01:14 PDT 2021
+version.buildmeta=606
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+576
+version.semver=0.8.0-beta+606

From bd14a1e15ed2c0febd3243f4def62f9f2b476571 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 May 2021 11:05:23 -0700
Subject: [PATCH 140/262] Included currencies in help response.

---
 .../thauvin/erik/mobibot/modules/Bitcoin.kt   | 41 +++++++++++++++----
 .../erik/mobibot/modules/BitcoinTest.kt       |  4 +-
 version.properties                            |  6 +--
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
index 0289bf2..428917d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
@@ -48,21 +48,38 @@ import java.net.URL
 class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
     // Currencies
     private val currencies = listOf(
-            "USD", "AUD", "BRL", "CAD", "CHF", "CLP", "CNY", "DKK", "EUR", "GBP", "HKD", "INR", "ISK", "JPY", "KRW", 
+            "USD", "AUD", "BRL", "CAD", "CHF", "CLP", "CNY", "DKK", "EUR", "GBP", "HKD", "INR", "ISK", "JPY", "KRW",
             "NZD", "PLN", "RUB", "SEK", "SGD", "THB", "TRY", "TWD");
 
+    override fun helpResponse(sender: String, isPrivate: Boolean): Boolean {
+        with(bot) {
+            send(sender, "To retrieve the bitcoin market price:", isPrivate)
+            send(
+                    sender,
+                    Utils.helpFormat(
+                            Utils.buildCmdSyntax(
+                                    "%c $BITCOIN_CMD <USD|GBP|EUR|...>",
+                                    nick,
+                                    isPrivateMsgEnabled)
+                    ),
+                    isPrivate
+            )
+            send(sender, "The supported currencies are: ", isPrivate)
+            @Suppress("MagicNumber")
+            sendList(sender, currencies, 12, isPrivate, isIndent = true)
+        }
+        return true
+    }
+
     /**
      * Returns the bitcoin market price from [Blockchain.info](https://blockchain.info/ticker).
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
         with(bot) {
-            val arg  = args.trim().uppercase()
+            val arg = args.trim().uppercase()
             @Suppress("MagicNumber")
             if (!currencies.contains(arg)) {
                 helpResponse(sender, isPrivate)
-                send(sender, "The supported currencies are: ", isPrivate)
-                @Suppress("MagicNumber")
-                sendList(sender, currencies, 12, isPrivate, isIndent = true)
             } else {
                 try {
                     val messages = marketPrice(arg)
@@ -81,9 +98,15 @@ class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
         // Blockchain Ticker URL
         private const val TICKER_URL = "https://blockchain.info/ticker"
 
-        // Quote command
+        // Bitcoin command
         private const val BITCOIN_CMD = "bitcoin"
 
+        // BTC command
+        private const val BTC_CMD = "btc"
+
+        // XBT command
+        private const val XBT_CMD = "xbt"
+
         /**
          * Retrieves the bitcoin market price.
          */
@@ -98,7 +121,7 @@ class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
                 val bpi = json.getJSONObject(currency.trim().uppercase())
                 val symbol = bpi.getString("symbol");
                 with(messages) {
-                    add(PublicMessage("BTC: $symbol" + bpi.getBigDecimal("last") + " [$currency]"))
+                    add(PublicMessage("BITCOIN: $symbol" + bpi.getBigDecimal("last") + " [$currency]"))
                     add(NoticeMessage("    15m:     $symbol" + bpi.getBigDecimal("15m")))
                     add(NoticeMessage("    Buy:     $symbol" + bpi.getBigDecimal("buy")))
                     add(NoticeMessage("    Sell:    $symbol" + bpi.getBigDecimal("sell")))
@@ -117,7 +140,7 @@ class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
 
     init {
         commands.add(BITCOIN_CMD)
-        help.add("To retrieve the bitcoin market price:")
-        help.add(Utils.helpFormat("%c $BITCOIN_CMD <USD|GBP|EUR|...>"))
+        commands.add(BTC_CMD)
+        commands.add(XBT_CMD)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
index 8453420..31f7ede 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
@@ -45,11 +45,11 @@ class BitcoinTest : LocalProperties() {
     fun testMarketPrice() {
         var messages = marketPrice("USD")
         assertThat(messages).`as`("not empty").isNotEmpty
-        assertThat(messages[0].msg).`as`("btc & $").startsWith("BTC").contains("$")
+        assertThat(messages[0].msg).`as`("bitcoin &  $").startsWith("BITCOIN").contains("$")
         assertThat(messages[1].msg).`as`("15m").contains("15m")
 
         messages = marketPrice("GBP")
-        assertThat(messages[0].msg).`as`("BPB btc & £").startsWith("BTC").contains("£")
+        assertThat(messages[0].msg).`as`("£").contains("£").contains("GBP")
         assertThat(messages[1].msg).`as`("GBP 15m").contains("15m")
     }
 }
diff --git a/version.properties b/version.properties
index dcde182..cb3f1db 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 04 01:01:14 PDT 2021
-version.buildmeta=606
+#Tue May 04 11:01:30 PDT 2021
+version.buildmeta=610
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+606
+version.semver=0.8.0-beta+610

From bf985d56260c8869324c0193ea881398ff6cf21d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 May 2021 17:57:47 -0700
Subject: [PATCH 141/262] Fixed Google search test.

---
 .../net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt    | 6 +++---
 version.properties                                          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index 2dca819..4d8abd5 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -47,9 +47,9 @@ class GoogleSearchTest : LocalProperties() {
         val apiKey = getProperty(GoogleSearch.GOOGLE_API_KEY_PROP)
         val cseKey = getProperty(GoogleSearch.GOOGLE_CSE_KEY_PROP)
         try {
-            var messages = searchGoogle("mobibot site:github.com", apiKey, cseKey)
-            assertThat(messages).`as`("mobibot results not empty").isNotEmpty
-            assertThat(messages[0].msg).`as`("found mobitopia").contains("mobibot")
+            var messages = searchGoogle("mobitopia", apiKey, cseKey)
+            assertThat(messages).`as`("mobitopia results not empty").isNotEmpty
+            assertThat(messages[0].msg).`as`("found freenode").contains("freenode")
             messages = searchGoogle("aapl", apiKey, cseKey)
             assertThat(messages).`as`("aapl results not empty").isNotEmpty
             assertThat(messages[0].msg).`as`("found apple").containsIgnoringCase("apple")
diff --git a/version.properties b/version.properties
index cb3f1db..2fc39d3 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 04 11:01:30 PDT 2021
-version.buildmeta=610
+#Tue May 04 17:52:51 PDT 2021
+version.buildmeta=618
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+610
+version.semver=0.8.0-beta+618

From df7384570e4f0be82b826a8ebbba2cf8ee7a0905 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 May 2021 21:58:49 -0700
Subject: [PATCH 142/262] Fixed formatting.

---
 .../net/thauvin/erik/mobibot/modules/Bitcoin.kt   | 15 ++++++++-------
 version.properties                                |  6 +++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
index 428917d..f191c40 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
@@ -41,6 +41,7 @@ import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
 import java.net.URL
+import java.text.DecimalFormat
 
 /**
  * The Bitcoin module.
@@ -104,8 +105,9 @@ class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
         // BTC command
         private const val BTC_CMD = "btc"
 
-        // XBT command
-        private const val XBT_CMD = "xbt"
+        private fun JSONObject.getDecimal(key: String): String {
+            return DecimalFormat("0.00").format(this.getBigDecimal(key))
+        }
 
         /**
          * Retrieves the bitcoin market price.
@@ -121,10 +123,10 @@ class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
                 val bpi = json.getJSONObject(currency.trim().uppercase())
                 val symbol = bpi.getString("symbol");
                 with(messages) {
-                    add(PublicMessage("BITCOIN: $symbol" + bpi.getBigDecimal("last") + " [$currency]"))
-                    add(NoticeMessage("    15m:     $symbol" + bpi.getBigDecimal("15m")))
-                    add(NoticeMessage("    Buy:     $symbol" + bpi.getBigDecimal("buy")))
-                    add(NoticeMessage("    Sell:    $symbol" + bpi.getBigDecimal("sell")))
+                    add(PublicMessage("BITCOIN: $symbol" + bpi.getDecimal("last") + " [$currency]"))
+                    add(NoticeMessage("    15m:     $symbol" + bpi.getDecimal("15m")))
+                    add(NoticeMessage("    Buy:     $symbol" + bpi.getDecimal("buy")))
+                    add(NoticeMessage("    Sell:    $symbol" + bpi.getDecimal("sell")))
                 }
                 return messages
             } catch (e: IOException) {
@@ -141,6 +143,5 @@ class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(BITCOIN_CMD)
         commands.add(BTC_CMD)
-        commands.add(XBT_CMD)
     }
 }
diff --git a/version.properties b/version.properties
index 2fc39d3..c49a803 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 04 17:52:51 PDT 2021
-version.buildmeta=618
+#Tue May 04 21:29:29 PDT 2021
+version.buildmeta=628
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+618
+version.semver=0.8.0-beta+628

From 87cb58102aef104275dc6bcccce89971d4a98ccd Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 May 2021 23:10:47 -0700
Subject: [PATCH 143/262] Only return BTC 15m, etc. if different from current
 price.

---
 .../kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt    | 8 +++++---
 .../net/thauvin/erik/mobibot/modules/BitcoinTest.kt       | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
index f191c40..1fa2cbf 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
@@ -124,9 +124,11 @@ class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
                 val symbol = bpi.getString("symbol");
                 with(messages) {
                     add(PublicMessage("BITCOIN: $symbol" + bpi.getDecimal("last") + " [$currency]"))
-                    add(NoticeMessage("    15m:     $symbol" + bpi.getDecimal("15m")))
-                    add(NoticeMessage("    Buy:     $symbol" + bpi.getDecimal("buy")))
-                    add(NoticeMessage("    Sell:    $symbol" + bpi.getDecimal("sell")))
+                    if (bpi.getBigDecimal("15m") != bpi.getBigDecimal("last")) {
+                        add(NoticeMessage("    15m:     $symbol" + bpi.getDecimal("15m")))
+                        add(NoticeMessage("    Buy:     $symbol" + bpi.getDecimal("buy")))
+                        add(NoticeMessage("    Sell:    $symbol" + bpi.getDecimal("sell")))
+                    }
                 }
                 return messages
             } catch (e: IOException) {
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
index 31f7ede..3866d81 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
@@ -46,10 +46,10 @@ class BitcoinTest : LocalProperties() {
         var messages = marketPrice("USD")
         assertThat(messages).`as`("not empty").isNotEmpty
         assertThat(messages[0].msg).`as`("bitcoin &  $").startsWith("BITCOIN").contains("$")
-        assertThat(messages[1].msg).`as`("15m").contains("15m")
+        //assertThat(messages[1].msg).`as`("15m").contains("15m")
 
         messages = marketPrice("GBP")
         assertThat(messages[0].msg).`as`("£").contains("£").contains("GBP")
-        assertThat(messages[1].msg).`as`("GBP 15m").contains("15m")
+        //assertThat(messages[1].msg).`as`("GBP 15m").contains("15m")
     }
 }

From 35399c3f789708942f53e6b0e8ae2889098e206b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 May 2021 23:11:19 -0700
Subject: [PATCH 144/262] Updated to jacoco 0.8.7

---
 build.gradle       | 2 +-
 version.properties | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index acceb2d..a1c957e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -170,7 +170,7 @@ sonarqube {
 }
 
 jacoco {
-    toolVersion = '0.8.7-SNAPSHOT'
+    toolVersion = '0.8.7'
 }
 
 jacocoTestReport {
diff --git a/version.properties b/version.properties
index c49a803..4e4295c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 04 21:29:29 PDT 2021
-version.buildmeta=628
+#Tue May 04 23:03:56 PDT 2021
+version.buildmeta=631
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+628
+version.semver=0.8.0-beta+631

From 1f965a1833cca19054f0d0d9746f9eef08210238 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 4 May 2021 23:41:00 -0700
Subject: [PATCH 145/262] BTC price output cleanup.

---
 src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt  | 2 +-
 version.properties                                          | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
index 1fa2cbf..db94db6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
@@ -123,7 +123,7 @@ class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
                 val bpi = json.getJSONObject(currency.trim().uppercase())
                 val symbol = bpi.getString("symbol");
                 with(messages) {
-                    add(PublicMessage("BITCOIN: $symbol" + bpi.getDecimal("last") + " [$currency]"))
+                    add(PublicMessage("Bitcoin [BTC]: $symbol" + bpi.getDecimal("last") + " [$currency]"))
                     if (bpi.getBigDecimal("15m") != bpi.getBigDecimal("last")) {
                         add(NoticeMessage("    15m:     $symbol" + bpi.getDecimal("15m")))
                         add(NoticeMessage("    Buy:     $symbol" + bpi.getDecimal("buy")))
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
index 3866d81..2394bb5 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
@@ -45,7 +45,7 @@ class BitcoinTest : LocalProperties() {
     fun testMarketPrice() {
         var messages = marketPrice("USD")
         assertThat(messages).`as`("not empty").isNotEmpty
-        assertThat(messages[0].msg).`as`("bitcoin &  $").startsWith("BITCOIN").contains("$")
+        assertThat(messages[0].msg).`as`("bitcoin, BTC, $").startsWith("Bitcoin").contains("BTC").contains("$")
         //assertThat(messages[1].msg).`as`("15m").contains("15m")
 
         messages = marketPrice("GBP")
diff --git a/version.properties b/version.properties
index 4e4295c..80c6644 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 04 23:03:56 PDT 2021
-version.buildmeta=631
+#Tue May 04 23:36:08 PDT 2021
+version.buildmeta=632
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+631
+version.semver=0.8.0-beta+632

From f580f0f7f24fecea598ec93bace0d2b017047f94 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 6 May 2021 02:39:27 -0700
Subject: [PATCH 146/262] Implemented CryptoPrices (Coinbase API), replacing
 the Bitcoin module.

---
 build.gradle                                  |   5 +
 config/detekt/baseline.xml                    |   6 +-
 .../net/thauvin/erik/mobibot/Mobibot.kt       |   4 +-
 .../thauvin/erik/mobibot/modules/Bitcoin.kt   | 149 ------------------
 .../erik/mobibot/modules/CryptoPrices.kt      | 103 ++++++++++++
 .../{BitcoinTest.kt => CryptoPricesTest.kt}   |  40 +++--
 version.properties                            |   6 +-
 7 files changed, 145 insertions(+), 168 deletions(-)
 delete mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
 create mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
 rename src/test/kotlin/net/thauvin/erik/mobibot/modules/{BitcoinTest.kt => CryptoPricesTest.kt} (56%)

diff --git a/build.gradle b/build.gradle
index a1c957e..d55ba00 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,9 +50,14 @@ dependencies {
     implementation 'org.apache.commons:commons-lang3:3.12.0'
 
     implementation 'com.rometools:rome:1.15.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'net.aksingh:owm-japis:2.5.3.0'
     implementation 'net.objecthunter:exp4j:0.4.8'
+    
+    implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
     implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
+    
+
     implementation 'org.json:json:20210307'
     implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index a4065f6..5dab69a 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -15,8 +15,8 @@
     <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
     <ID>NestedBlockDepth:Addons.kt$Addons$ fun add(command: AbstractCommand, props: Properties)</ID>
-    <ID>NestedBlockDepth:Bitcoin.kt$Bitcoin$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:Comment.kt$Comment$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
+    <ID>NestedBlockDepth:CryptoPrices.kt$CryptoPrices$ override fun run(sender: String, cmd: String, args: String, 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.Companion$ @Suppress("MagicNumber") @JvmStatic fun convertCurrency(query: String): Message</ID>
@@ -39,12 +39,12 @@
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
-    <ID>ThrowsCount:Bitcoin.kt$Bitcoin.Companion$ @JvmStatic @Throws(ModuleException::class) fun marketPrice(currency: String): List&lt;Message&gt;</ID>
+    <ID>ThrowsCount:CryptoPrices.kt$CryptoPrices.Companion$ @JvmStatic @Throws(ModuleException::class) fun marketPrice(base: String, currency: String): Price</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
     <ID>ThrowsCount:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
-    <ID>TooGenericExceptionCaught:Bitcoin.kt$Bitcoin.Companion$e: NullPointerException</ID>
+    <ID>TooGenericExceptionCaught:CryptoPrices.kt$CryptoPrices$e: Exception</ID>
     <ID>TooGenericExceptionCaught:FeedReader.kt$FeedReader$e: Exception</ID>
     <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$e: Exception</ID>
     <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$ex: Exception</ID>
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 72f0e89..1efd54b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -64,7 +64,7 @@ import net.thauvin.erik.mobibot.commands.links.View
 import net.thauvin.erik.mobibot.commands.tell.Tell
 import net.thauvin.erik.mobibot.entries.EntriesMgr
 import net.thauvin.erik.mobibot.entries.EntryLink
-import net.thauvin.erik.mobibot.modules.Bitcoin
+import net.thauvin.erik.mobibot.modules.CryptoPrices
 import net.thauvin.erik.mobibot.modules.Calc
 import net.thauvin.erik.mobibot.modules.CurrencyConverter
 import net.thauvin.erik.mobibot.modules.Dice
@@ -678,8 +678,8 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         addons.add(View(this), p)
 
         // Load the modules
-        addons.add(Bitcoin(this), p)
         addons.add(Calc(this), p)
+        addons.add(CryptoPrices(this), p)
         addons.add(CurrencyConverter(this), p)
         addons.add(Dice(this), p)
         addons.add(GoogleSearch(this), p)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
deleted file mode 100644
index db94db6..0000000
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Bitcoin.kt
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Bitcoin.kt
- *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.thauvin.erik.mobibot.modules
-
-import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
-import net.thauvin.erik.mobibot.msg.ErrorMessage
-import net.thauvin.erik.mobibot.msg.Message
-import net.thauvin.erik.mobibot.msg.NoticeMessage
-import net.thauvin.erik.mobibot.msg.PublicMessage
-import org.json.JSONException
-import org.json.JSONObject
-import java.io.IOException
-import java.net.URL
-import java.text.DecimalFormat
-
-/**
- * The Bitcoin module.
- */
-class Bitcoin(bot: Mobibot) : ThreadedModule(bot) {
-    // Currencies
-    private val currencies = listOf(
-            "USD", "AUD", "BRL", "CAD", "CHF", "CLP", "CNY", "DKK", "EUR", "GBP", "HKD", "INR", "ISK", "JPY", "KRW",
-            "NZD", "PLN", "RUB", "SEK", "SGD", "THB", "TRY", "TWD");
-
-    override fun helpResponse(sender: String, isPrivate: Boolean): Boolean {
-        with(bot) {
-            send(sender, "To retrieve the bitcoin market price:", isPrivate)
-            send(
-                    sender,
-                    Utils.helpFormat(
-                            Utils.buildCmdSyntax(
-                                    "%c $BITCOIN_CMD <USD|GBP|EUR|...>",
-                                    nick,
-                                    isPrivateMsgEnabled)
-                    ),
-                    isPrivate
-            )
-            send(sender, "The supported currencies are: ", isPrivate)
-            @Suppress("MagicNumber")
-            sendList(sender, currencies, 12, isPrivate, isIndent = true)
-        }
-        return true
-    }
-
-    /**
-     * Returns the bitcoin market price from [Blockchain.info](https://blockchain.info/ticker).
-     */
-    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        with(bot) {
-            val arg = args.trim().uppercase()
-            @Suppress("MagicNumber")
-            if (!currencies.contains(arg)) {
-                helpResponse(sender, isPrivate)
-            } else {
-                try {
-                    val messages = marketPrice(arg)
-                    for (msg in messages) {
-                        send(sender, msg)
-                    }
-                } catch (e: ModuleException) {
-                    if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                    send(e.message)
-                }
-            }
-        }
-    }
-
-    companion object {
-        // Blockchain Ticker URL
-        private const val TICKER_URL = "https://blockchain.info/ticker"
-
-        // Bitcoin command
-        private const val BITCOIN_CMD = "bitcoin"
-
-        // BTC command
-        private const val BTC_CMD = "btc"
-
-        private fun JSONObject.getDecimal(key: String): String {
-            return DecimalFormat("0.00").format(this.getBigDecimal(key))
-        }
-
-        /**
-         * Retrieves the bitcoin market price.
-         */
-        @JvmStatic
-        @Throws(ModuleException::class)
-        fun marketPrice(currency: String): List<Message> {
-            val debugMessage = "marketPrice($currency)"
-            val messages = mutableListOf<Message>()
-            try {
-                val response = Utils.urlReader(URL("$TICKER_URL"))
-                val json = JSONObject(response)
-                val bpi = json.getJSONObject(currency.trim().uppercase())
-                val symbol = bpi.getString("symbol");
-                with(messages) {
-                    add(PublicMessage("Bitcoin [BTC]: $symbol" + bpi.getDecimal("last") + " [$currency]"))
-                    if (bpi.getBigDecimal("15m") != bpi.getBigDecimal("last")) {
-                        add(NoticeMessage("    15m:     $symbol" + bpi.getDecimal("15m")))
-                        add(NoticeMessage("    Buy:     $symbol" + bpi.getDecimal("buy")))
-                        add(NoticeMessage("    Sell:    $symbol" + bpi.getDecimal("sell")))
-                    }
-                }
-                return messages
-            } catch (e: IOException) {
-                throw ModuleException(debugMessage, "An IO error has occurred retrieving the bitcoin market price.", e)
-            } catch (e: NullPointerException) {
-                throw ModuleException(debugMessage, "An error has occurred retrieving the bitcoin market price.", e)
-            } catch (e: org.json.JSONException) {
-                throw ModuleException(
-                        debugMessage, "A parsing error has occurred retriving the bitcoin market price.", e)
-            }
-        }
-    }
-
-    init {
-        commands.add(BITCOIN_CMD)
-        commands.add(BTC_CMD)
-    }
-}
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
new file mode 100644
index 0000000..20c42b8
--- /dev/null
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -0,0 +1,103 @@
+/*
+ * CryptoPrices.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import net.thauvin.erik.crypto.CryptoPrice.Companion.marketPrice
+import net.thauvin.erik.crypto.CryptoException
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.msg.ErrorMessage
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.NoticeMessage
+import net.thauvin.erik.mobibot.msg.PublicMessage
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.IOException
+import java.net.URL
+import java.text.DecimalFormat
+import java.time.format.DateTimeFormatter
+import java.time.Instant
+import java.time.temporal.ChronoUnit
+import java.time.ZoneId
+import java.time.ZoneOffset
+
+data class Price(val base: String, val currency: String, val amount: Double)
+
+/**
+ * The Cryptocurrency Prices  module.
+ */
+class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
+    val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneOffset.UTC)
+    val decimalFormat = DecimalFormat("0.00")
+
+    /**
+     * Returns the cryptocurrency market price from [Coinbase](https://developers.coinbase.com/api/v2#get-spot-price).
+     */
+    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+        val debugMessage = "crypto($cmd $args)"
+        with(bot) {
+            if (args.matches("\\w+( [a-zA-Z]{3}+)?".toRegex())) {
+                val params = args.trim().split(" ");
+                try {
+                    val currency = if (params.size == 2) params[1] else "USD"
+                    val price = marketPrice(params[0], currency)
+                    send(sender, PublicMessage("${price.base}: ${price.amount} [${price.currency}]"))
+                } catch (e: CryptoException) {
+                    if (logger.isWarnEnabled) logger.warn("$debugMessage => ${e.statusCode}", e)
+                    send(e.message)
+                } catch (e: Exception) {
+                    if (logger.isErrorEnabled) logger.error(debugMessage, e)
+                    send("An error has occurred while retrieving the cryptocurrency market price.")
+                }
+            } else {
+                helpResponse(sender, isPrivate)
+            }
+        }
+    }
+
+    companion object {
+        // Crypto command
+        private const val CRYPTO_CMD = "crypto"
+    }
+
+    init {
+        commands.add(CRYPTO_CMD)
+        help.add("To retrieve a cryptocurrency's market price:")
+        help.add(Utils.helpFormat("%c $CRYPTO_CMD <symbol> [<currency>]"))
+        help.add("For example:")
+        help.add(Utils.helpFormat("%c $CRYPTO_CMD BTC"))
+        help.add(Utils.helpFormat("%c $CRYPTO_CMD ETH EUR"))
+        help.add(Utils.helpFormat("%c $CRYPTO_CMD ETH2 GPB"))
+    }
+}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
similarity index 56%
rename from src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
index 2394bb5..bd07f1c 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/BitcoinTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
@@ -1,5 +1,5 @@
 /*
- * BitcoinTest.kt
+ * CryptoPricesTest.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -31,25 +31,43 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import net.thauvin.erik.crypto.CryptoPrice.Companion.marketPrice
+import net.thauvin.erik.crypto.CryptoException
 import net.thauvin.erik.mobibot.LocalProperties
-import net.thauvin.erik.mobibot.modules.Bitcoin.Companion.marketPrice
 import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
 
 /**
- * The `BitcoinTest` class.
+ * The `CryptoPricesTest` class.
  */
-class BitcoinTest : LocalProperties() {
+class CryptoPricesTest {
     @Test
     @Throws(ModuleException::class)
     fun testMarketPrice() {
-        var messages = marketPrice("USD")
-        assertThat(messages).`as`("not empty").isNotEmpty
-        assertThat(messages[0].msg).`as`("bitcoin, BTC, $").startsWith("Bitcoin").contains("BTC").contains("$")
-        //assertThat(messages[1].msg).`as`("15m").contains("15m")
+        var price = marketPrice("BTC", "USD")
+        assertThat(price.base).`as`("is BTC").isEqualTo("BTC")
+        assertThat(price.currency).`as`("is USD").isEqualTo("USD")
+        assertThat(price.amount).`as`("BTC > 0").isGreaterThan(0.00)
 
-        messages = marketPrice("GBP")
-        assertThat(messages[0].msg).`as`("£").contains("£").contains("GBP")
-        //assertThat(messages[1].msg).`as`("GBP 15m").contains("15m")
+        price = marketPrice("ETH", "EUR")
+        assertThat(price.base).`as`("is ETH").isEqualTo("ETH")
+        assertThat(price.currency).`as`("is EUR").isEqualTo("EUR")
+        assertThat(price.amount).`as`("ETH > 0").isGreaterThan(0.00)
+
+        price = marketPrice("ETH2", "GBP")
+        assertThat(price.base).`as`("is ETH2").isEqualTo("ETH2")
+        assertThat(price.currency).`as`("is GBP").isEqualTo("GBP")
+        assertThat(price.amount).`as`("ETH2 > 0").isGreaterThan(0.00)
+
+        assertThatThrownBy { marketPrice("FOO", "USD") }
+                .`as`("FOO")
+                .isInstanceOf(CryptoException::class.java)
+                .hasMessageContaining("Invalid base currency")
+
+        assertThatThrownBy { marketPrice("FOO", "BAR") }
+                .`as`("FOO-BAR")
+                .isInstanceOf(CryptoException::class.java)
+                .hasMessageContaining("Invalid currency (BAR)")
     }
 }
diff --git a/version.properties b/version.properties
index 80c6644..f827da8 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 04 23:36:08 PDT 2021
-version.buildmeta=632
+#Sat May 08 02:52:53 PDT 2021
+version.buildmeta=688
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+632
+version.semver=0.8.0-beta+688

From ec049c748588170f9cea1c1b537913b291cb39c8 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 10 May 2021 15:57:02 -0700
Subject: [PATCH 147/262] Updated to JDK >= 11 on CIs and switched to Gradle
 7.0.1

---
 .circleci/config.yml                     | 8 ++++----
 .gitlab-ci.yml                           | 2 +-
 .travis.yml                              | 2 +-
 build.gradle                             | 4 +++-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 version.properties                       | 6 +++---
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41e99be..33e114d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle
         path: build/reports/
 
 jobs:
-  build_gradle_jdk15:
+  build_gradle_jdk16:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:15.0.2
+      - image: cimg/openjdk:16.0.0
 
     <<: *defaults_gradle
 
@@ -42,7 +42,7 @@ jobs:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:11.0.7
+      - image: cimg/openjdk:11.0.10
 
     <<: *defaults_gradle
 
@@ -51,5 +51,5 @@ workflows:
   gradle:
         jobs:
         - build_gradle_jdk11
-        - build_gradle_jdk15
+        - build_gradle_jdk16
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e06d44..4b01f79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: openjdk:11-jdk-slim
+image: gradle:7-jdk11
 
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
diff --git a/.travis.yml b/.travis.yml
index 83aefb4..84c808c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ addons:
 
 jdk:
   - openjdk11
-  - openjdk14
+  - openjdk15
 
 before_install:
   - chmod +x gradlew
diff --git a/build.gradle b/build.gradle
index d55ba00..d5efd48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,7 +57,6 @@ dependencies {
     implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
     implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
     
-
     implementation 'org.json:json:20210307'
     implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
@@ -73,6 +72,9 @@ dependencies {
 }
 
 test {
+    testLogging {
+        exceptionFormat "full"
+    }
     useTestNG() {
         options.suites('src/test/resources/testng.xml')
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643..e5338d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/version.properties b/version.properties
index f827da8..4d6d016 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat May 08 02:52:53 PDT 2021
-version.buildmeta=688
+#Mon May 10 15:50:39 PDT 2021
+version.buildmeta=696
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+688
+version.semver=0.8.0-beta+696

From eff93791d1fab49fdb9d70f301a514376241890e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 10 May 2021 17:20:57 -0700
Subject: [PATCH 148/262] Reverted to JDK 15 on CircleCI.

---
 .circleci/config.yml | 6 +++---
 version.properties   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 33e114d..19da0e1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,11 +30,11 @@ defaults_gradle: &defaults_gradle
         path: build/reports/
 
 jobs:
-  build_gradle_jdk16:
+  build_gradle_jdk15:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:16.0.0
+      - image: cimg/openjdk:15.0.2
 
     <<: *defaults_gradle
 
@@ -51,5 +51,5 @@ workflows:
   gradle:
         jobs:
         - build_gradle_jdk11
-        - build_gradle_jdk16
+        - build_gradle_jdk15
 
diff --git a/version.properties b/version.properties
index 4d6d016..1aeba4f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon May 10 15:50:39 PDT 2021
-version.buildmeta=696
+#Mon May 10 17:07:39 PDT 2021
+version.buildmeta=698
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+696
+version.semver=0.8.0-beta+698

From 56b8114b93cae03ccc6f31921a744806ed689f00 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 10 May 2021 23:03:51 -0700
Subject: [PATCH 149/262] Cleanup.

---
 .../kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt    | 6 +++---
 version.properties                                          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index d8ec28c..d6bb8f4 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -48,14 +48,14 @@ class PinboardUtilsTest : LocalProperties() {
         val entry = EntryLink(url, "Test Example", "ErikT", "", "#mobitopia", listOf("test"))
 
         PinboardUtils.addPin(pinboard, ircServer, entry)
-        Assert.assertTrue(validatePin(apiToken, ircServer, entry.link), "add")
+        Assert.assertTrue(validatePin(apiToken, ircServer, entry.link), "addPin")
         entry.link = "https://www.foo.com/"
 
         PinboardUtils.updatePin(pinboard, ircServer, url, entry)
-        Assert.assertTrue(validatePin(apiToken, ircServer, entry.link), "update")
+        Assert.assertTrue(validatePin(apiToken, ircServer, entry.link), "updatePin")
 
         PinboardUtils.deletePin(pinboard, entry)
-        Assert.assertFalse(validatePin(apiToken, url = entry.link), "delete")
+        Assert.assertFalse(validatePin(apiToken, url = entry.link), "deletePin")
     }
 
     private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean {
diff --git a/version.properties b/version.properties
index 1aeba4f..10ef04f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon May 10 17:07:39 PDT 2021
-version.buildmeta=698
+#Mon May 10 22:46:41 PDT 2021
+version.buildmeta=713
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+698
+version.semver=0.8.0-beta+713

From 22e29d5ce36b292d3ff942747347d53176a13d46 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 11 May 2021 00:15:28 -0700
Subject: [PATCH 150/262] Converted ModuleExceptionTest to Kotlin.

---
 .idea/codeStyles/Project.xml                  |  10 +-
 .idea/jarRepositories.xml                     |   5 +
 .idea/libraries-with-intellij-classes.xml     |  65 +++++++++
 .idea/misc.xml                                |   3 +-
 .idea/mobibot.iml                             |  12 --
 .idea/modules.xml                             |  10 --
 .idea/modules/mobibot.main.iml                | 100 --------------
 .idea/modules/mobibot.test.iml                | 125 ------------------
 config/detekt/baseline.xml                    |   1 -
 .../mobibot/modules/ModuleExceptionTest.java  |  80 -----------
 .../mobibot/modules/ModuleExceptionTest.kt    |  75 +++++++++++
 version.properties                            |   6 +-
 12 files changed, 159 insertions(+), 333 deletions(-)
 create mode 100644 .idea/libraries-with-intellij-classes.xml
 delete mode 100644 .idea/mobibot.iml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/modules/mobibot.main.iml
 delete mode 100644 .idea/modules/mobibot.test.iml
 delete mode 100644 src/test/java/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.java
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 10683d5..6407ef6 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -344,10 +344,18 @@
       </arrangement>
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
       <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="5" />
+      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 29dc1da..a3c8d4d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,10 @@
       <option name="name" value="MavenLocal" />
       <option name="url" value="file:$MAVEN_REPOSITORY$/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml
new file mode 100644
index 0000000..9fa3156
--- /dev/null
+++ b/.idea/libraries-with-intellij-classes.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="libraries-with-intellij-classes">
+    <option name="intellijApiContainingLibraries">
+      <list>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="ideaIU" />
+          <option name="groupId" value="com.jetbrains.intellij.idea" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="ideaIU" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="ideaIC" />
+          <option name="groupId" value="com.jetbrains.intellij.idea" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="ideaIC" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="pycharmPY" />
+          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="pycharmPY" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="pycharmPC" />
+          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="pycharmPC" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="clion" />
+          <option name="groupId" value="com.jetbrains.intellij.clion" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="clion" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="riderRD" />
+          <option name="groupId" value="com.jetbrains.intellij.rider" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="riderRD" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="goland" />
+          <option name="groupId" value="com.jetbrains.intellij.goland" />
+        </LibraryCoordinatesState>
+        <LibraryCoordinatesState>
+          <option name="artifactId" value="goland" />
+          <option name="groupId" value="com.jetbrains" />
+        </LibraryCoordinatesState>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1fa7978..fb38c4a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="14" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="15" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
deleted file mode 100644
index 255f0c1..0000000
--- a/.idea/mobibot.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.8.0-beta+359" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 2150ab5..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/mobibot.iml" filepath="$PROJECT_DIR$/.idea/mobibot.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/mobibot.main.iml" filepath="$PROJECT_DIR$/.idea/modules/mobibot.main.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/mobibot.test.iml" filepath="$PROJECT_DIR$/.idea/modules/mobibot.test.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml
deleted file mode 100644
index c12d92e..0000000
--- a/.idea/modules/mobibot.main.iml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+359" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/semver/1.2.0/semver-1.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar" />
-          <option name="noStdlib" value="true" />
-          <option name="noReflect" value="true" />
-          <option name="moduleName" value="mobibot" />
-          <option name="jvmTarget" value="11" />
-          <option name="languageVersion" value="1.4" />
-          <option name="apiVersion" value="1.4" />
-          <option name="pluginOptions">
-            <array />
-          </option>
-          <option name="pluginClasspaths">
-            <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.4.20/fc1d26586910b32d676480c75acd3e922e5e81fa/kotlin-compiler-embeddable-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.4.20/a051291fb01bf2397759625626fec670cd57b3f0/kotlin-daemon-embeddable-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.4.20/411fc46e908bfa9c034f52b0d31b2e1f61f06127/kotlin-reflect-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.20/9793d2f6b262847a2d8127951c5786cf907cc7b1/kotlin-script-runtime-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.20/2e2bf29688a76cec111df56bc5e358c5bbc5057/kotlin-scripting-common-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.20/83704fbbe39946cc2ac6d0f07f41947abeb8dc20/kotlin-scripting-jvm-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar" />
-              <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
-              <option value="$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar" />
-            </array>
-          </option>
-          <option name="errors">
-            <ArgumentParseErrors />
-          </option>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/../../build/classes/java/main" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../build/generated/source/kapt/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/kapt/main" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../build/generated/source/kaptKotlin/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/kaptKotlin/main" isTestSource="false" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../src/main">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../build/tmp/kapt3/classes/main" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.20" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:sources:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
-    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
deleted file mode 100644
index 9e64bd2..0000000
--- a/.idea/modules/mobibot.test.iml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.8.0-beta+359" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 11" allPlatforms="JVM [11]" useProjectSettings="false">
-        <compilerSettings>
-          <option name="additionalArguments" value="-Xallow-no-source-files" />
-        </compilerSettings>
-        <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/test" />
-          <option name="classpath" value="$MODULE_DIR$/../../build/classes/java/main:/media/erik/Projects/java/mobibot/build/classes/kotlin/main:/media/erik/Projects/java/mobibot/build/tmp/kapt3/classes/main:/home/erik/.gradle/caches/modules-2/files-2.1/net.aksingh/owm-japis/2.5.3.0/c3aca5d34ba937e0c8e9776cec906003b0703044/owm-japis-2.5.3.0.jar:/media/erik/Projects/maven/repository/net/thauvin/erik/pinboard-poster/1.0.1/pinboard-poster-1.0.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.20/756521338269950c2a276f1abe6fef8e1a5e5528/kotlin-stdlib-jdk8-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.20/9de2c79e95d4b4699a455e88ba285a95352e0bea/kotlin-stdlib-jdk7-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar:/home/erik/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.15.0/d3614542b857eccc0555d1ee8dfc36d2043d9c1f/rome-1.15.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.4/c51c00206bb913cd8612b24abd9fa98ae89719b1/commons-cli-1.4.jar:/home/erik/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.7.2/fc22868c06d0b59dc97f23dc93ca77efd9381ab2/commons-net-3.7.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.8/cf1cfc0f958077d86ac7452c7e36d944689b2ec4/exp4j-0.4.8.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.11/68e9a6adf7cf8eb7e9d31bbc554c7c75eeaac568/commons-lang3-3.11.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.json/json/20201115/f8e7a9953822c90e0701c3cd50764b5e9063f85c/json-20201115.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.13.1/f9577f3732bb7caa4fee8aba5053158f4010c118/jsoup-1.13.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.7/5fdb375ccfb3eda7354efb262cbe9b53abccff2/twitter4j-core-4.0.7.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.14.0/e257b0562453f73eabac1bc3181ba33e79d193ed/log4j-core-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-slf4j-impl/2.14.0/d6003a3b3f24fdb476848f4ecabdb2a43354e410/log4j-slf4j-impl-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.14.0/23cdb2c6babad9b2b0dcf47c6a2c29d504e4c7a8/log4j-api-2.14.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.github.spotbugs/spotbugs-annotations/4.2.0/39d2a464e63fd44bcdbc2332b12a80df274dac83/spotbugs-annotations-4.2.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.assertj/assertj-core/3.18.1/aaa02680dd92a568a4278bb40aa4a6305f632ec0/assertj-core-3.18.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.testng/testng/7.3.0/a5069c3dfba58d23702f96c3d9f5081f5ce7136f/testng-7.3.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar:/media/erik/Projects/maven/repository/org/jetbrains/annotations/13.0/annotations-13.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.rometools/rome-utils/1.15.0/ab1cb95382bf9a8dec81165d328bcbbf1acfb3ae/rome-utils-1.15.0.jar:/media/erik/Projects/maven/repository/org/jdom/jdom2/2.0.6/jdom2-2.0.6.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.25/da76ca59f6a57ee3102f8f9bd9cee742973efa8a/slf4j-api-1.7.25.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.5.0/1c96fc5d0230f57d36cd09e2541d10829a3352a7/converter-gson-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.5/f645ed69d595b24d4cf8b3fbb64cc505bede8829/gson-2.8.5.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.5.0/713ce36037bf24a76a3974c05cb85c3f754b1cc3/retrofit-2.5.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.14.2/eaed79ed6bc1e14fad462172b6a09524545b165c/okhttp-3.14.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.inject/guice/4.2.2/fa13659f9128f4c011c8e1d06f137083b4876377/guice-4.2.2-no_aop.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/25.1-android/bdaab946ca5ad20253502d873ba0c3313d141036/guava-25.1-android.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.2/25ea2e8b0c338a877313bd4672d3fe056ea78f0d/jsr305-3.0.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.beust/jcommander/1.78/a3927de9bd6f351429bcf763712c9890629d8f51/jcommander-1.78.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant/1.10.3/88becdeb77cdd2457757b7268e1a10666c03d382/ant-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.yaml/snakeyaml/1.21/18775fdda48574784f40b47bf478ab0593f92e4d/snakeyaml-1.21.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.apache.ant/ant-launcher/1.10.3/9dd5189e7f561ca19833b4e3672720b9bc5cb2fe/ant-launcher-1.10.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar:/media/erik/Projects/maven/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/aopalliance/aopalliance/1.0/235ba8b489512805ac13a8f9ea77a1ca5ebe3e8/aopalliance-1.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker-compat-qual/2.0.0/fc89b03860d11d6213d0154a62bcd1c2f69b9efa/checker-compat-qual-2.0.0.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.3/39b109f2cd352b2d71b52a3b5a1a9850e1dc304b/error_prone_annotations-2.1.3.jar:/home/erik/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/erik/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar" />
-          <option name="noStdlib" value="true" />
-          <option name="noReflect" value="true" />
-          <option name="moduleName" value="mobibot" />
-          <option name="jvmTarget" value="11" />
-          <option name="friendPaths">
-            <array>
-              <option value="$MODULE_DIR$/../../build/classes/java/main" />
-              <option value="$MODULE_DIR$/../../build/classes/kotlin/main" />
-              <option value="$MODULE_DIR$/../../build/tmp/kapt3/classes/main" />
-              <option value="$MODULE_DIR$/../../build/libs/mobibot.jar" />
-            </array>
-          </option>
-          <option name="languageVersion" value="1.4" />
-          <option name="apiVersion" value="1.4" />
-          <option name="pluginOptions">
-            <array />
-          </option>
-          <option name="pluginClasspaths">
-            <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.4.20/fc1d26586910b32d676480c75acd3e922e5e81fa/kotlin-compiler-embeddable-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-daemon-embeddable/1.4.20/a051291fb01bf2397759625626fec670cd57b3f0/kotlin-daemon-embeddable-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.4.20/411fc46e908bfa9c034f52b0d31b2e1f61f06127/kotlin-reflect-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-script-runtime/1.4.20/9793d2f6b262847a2d8127951c5786cf907cc7b1/kotlin-script-runtime-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-common/1.4.20/2e2bf29688a76cec111df56bc5e358c5bbc5057/kotlin-scripting-common-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-scripting-jvm/1.4.20/83704fbbe39946cc2ac6d0f07f41947abeb8dc20/kotlin-scripting-jvm-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.20/c6761d7805b5312302f2bbd78cda68c976ce0c70/kotlin-stdlib-common-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.20/9be77b243a362b745e365f286627b8724337009c/kotlin-stdlib-1.4.20.jar" />
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.3.7/8e2eb78158638b33793d204ffef0b65c4a578e1c/kotlinx-coroutines-core-1.3.7.jar" />
-              <option value="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
-              <option value="$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar" />
-            </array>
-          </option>
-          <option name="errors">
-            <ArgumentParseErrors />
-          </option>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <output-test url="file://$MODULE_DIR$/../../build/classes/java/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../build/generated/source/kapt/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/kapt/test" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../build/generated/source/kaptKotlin/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../build/generated/source/kaptKotlin/test" isTestSource="true" generated="true" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../src/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/kotlin" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.7.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.yaml:snakeyaml:1.21" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.j2objc:j2objc-annotations:1.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
-    <orderEntry type="library" name="Gradle: org.testng:testng:7.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.assertj:assertj-core:3.18.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.inject:guice:no_aop:4.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.beust:jcommander:1.78" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.15.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.ant:ant:1.10.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.14.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.errorprone:error_prone_annotations:2.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20" level="project" />
-    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:25.1-android" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.ant:ant-launcher:1.10.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.checkerframework:checker-compat-qual:2.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.11" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.14.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20201115" level="project" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="Gradle: kaptGeneratedClasses">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../../build/tmp/kapt3/classes/test" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module" module-name="mobibot.main" />
-    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.4.20" level="project" />
-  </component>
-  <component name="TestModuleProperties" production-module="mobibot.main" />
-</module>
\ No newline at end of file
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 5dab69a..81addac 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -39,7 +39,6 @@
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
-    <ID>ThrowsCount:CryptoPrices.kt$CryptoPrices.Companion$ @JvmStatic @Throws(ModuleException::class) fun marketPrice(base: String, currency: String): Price</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.java
deleted file mode 100644
index b7feb89..0000000
--- a/src/test/java/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * ModuleExceptionTest.java
- *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.modules;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import java.io.IOException;
-import java.lang.reflect.Method;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * The <code>ModuleExceptionTest</code> class.
- */
-public class ModuleExceptionTest {
-    static final String debugMessage = "debugMessage";
-    static final String message = "message";
-
-    @DataProvider(name = "dp")
-    Object[][] createData(final Method m) {
-        return new Object[][]{ new Object[]{ new ModuleException(debugMessage,
-                                                                 message,
-                                                                 new IOException("URL http://foobar.com")) },
-                               new Object[]{ new ModuleException(debugMessage,
-                                                                 message,
-                                                                 new IOException("URL http://foobar.com?")) },
-                               new Object[]{ new ModuleException(debugMessage, message) } };
-    }
-
-    @Test(dataProvider = "dp")
-    final void testGetDebugMessage(final ModuleException e) {
-        assertThat(e.getDebugMessage()).as("get debug message").isEqualTo(debugMessage);
-    }
-
-    @Test(dataProvider = "dp")
-    final void testGetMessage(final ModuleException e) {
-        assertThat(e.getMessage()).as("get message").isEqualTo(message);
-    }
-
-    @Test
-    final void testGetSanitizedMessage() {
-        final String apiKey = "1234567890";
-        final ModuleException e = new ModuleException(debugMessage,
-                                                      message,
-                                                      new IOException(
-                                                              "URL http://foo.com?apiKey=" + apiKey + "&userID=me"));
-        assertThat(e.getSanitizedMessage(apiKey)).as("sanitized url").contains("xxxxxxxxxx").doesNotContain(apiKey);
-    }
-}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
new file mode 100644
index 0000000..e49da97
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
@@ -0,0 +1,75 @@
+/*
+ * ModuleExceptionTest.java
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules
+
+import org.assertj.core.api.Assertions
+import org.testng.annotations.DataProvider
+import org.testng.annotations.Test
+import java.io.IOException
+import java.lang.reflect.Method
+
+/**
+ * The `ModuleExceptionTest` class.
+ */
+class ModuleExceptionTest {
+    companion object {
+        const val debugMessage = "debugMessage"
+        const val message = "message"
+    }
+
+    @DataProvider(name = "dp")
+    fun createData(@Suppress("UNUSED_PARAMETER") m: Method?): Array<Array<Any>> {
+        return arrayOf(
+            arrayOf(ModuleException(debugMessage, message, IOException("URL http://foobar.com"))),
+            arrayOf(ModuleException(debugMessage,message,IOException("URL http://foobar.com?"))),
+            arrayOf(ModuleException(debugMessage, message))
+        )
+    }
+
+    @Test(dataProvider = "dp")
+    fun testGetDebugMessage(e: ModuleException) {
+        Assertions.assertThat(e.debugMessage).describedAs("get debug message").isEqualTo(debugMessage)
+    }
+
+    @Test(dataProvider = "dp")
+    fun testGetMessage(e: ModuleException) {
+        Assertions.assertThat(e.message).describedAs("get message").isEqualTo(message)
+    }
+
+    @Test
+    fun testGetSanitizedMessage() {
+        val apiKey = "1234567890"
+        val e = ModuleException(debugMessage, message, IOException("URL http://foo.com?apiKey=$apiKey&userID=me"))
+        Assertions.assertThat(e.getSanitizedMessage(apiKey)).describedAs("sanitized url")
+            .contains("xxxxxxxxxx").doesNotContain(apiKey)
+    }
+}
diff --git a/version.properties b/version.properties
index 10ef04f..e7931a0 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon May 10 22:46:41 PDT 2021
-version.buildmeta=713
+#Tue May 11 00:11:43 PDT 2021
+version.buildmeta=720
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+713
+version.semver=0.8.0-beta+720

From faf40d3048047028d83c536ae41864a5a2bac218 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 11 May 2021 00:51:35 -0700
Subject: [PATCH 151/262] Cleaned up tests.

---
 .../net/thauvin/erik/mobibot/UtilsTest.kt     | 53 ++++++++++---------
 .../mobibot/commands/tell/TellMessageTest.kt  | 20 +++----
 .../erik/mobibot/entries/EntryLinkTest.kt     | 20 +++----
 .../thauvin/erik/mobibot/modules/CalcTest.kt  | 11 ++--
 .../erik/mobibot/modules/CryptoPricesTest.kt  | 33 ++++++------
 .../mobibot/modules/CurrencyConverterTest.kt  | 11 ++--
 .../thauvin/erik/mobibot/modules/DiceTest.kt  |  6 +--
 .../erik/mobibot/modules/GoogleSearchTest.kt  | 14 ++---
 .../thauvin/erik/mobibot/modules/JokeTest.kt  |  4 +-
 .../erik/mobibot/modules/LookupTest.kt        |  4 +-
 .../mobibot/modules/ModuleExceptionTest.kt    |  2 +-
 .../thauvin/erik/mobibot/modules/PingTest.kt  |  4 +-
 .../mobibot/modules/RockPaperScissorsTest.kt  | 18 ++++---
 .../erik/mobibot/modules/StockQuoteTest.kt    | 12 ++---
 .../erik/mobibot/modules/TwitterTest.kt       |  2 +-
 .../erik/mobibot/modules/Weather2Test.kt      | 14 ++---
 .../erik/mobibot/modules/WordTimeTest.kt      |  6 +--
 version.properties                            |  6 +--
 18 files changed, 123 insertions(+), 117 deletions(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 8a33943..a57d591 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -74,25 +74,26 @@ class UtilsTest {
 
     @Test
     fun testBold() {
-        assertThat(bold(1)).`as`("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
-        assertThat(bold(ascii)).`as`("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+        assertThat(bold(1)).describedAs("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
+        assertThat(bold(ascii)).describedAs("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
     }
 
     @Test
     fun testCapitalize() {
-        assertThat(capitalize("test")).`as`("capitalize(test)").isEqualTo("Test")
-        assertThat(capitalize("Test")).`as`("capitalize(Test)").isEqualTo("Test")
-        assertThat(capitalize(null)).`as`("captitalize(null)").isNull()
-        assertThat(capitalize("")).`as`("capitalize()").isEqualTo("")
+        assertThat(capitalize("test")).describedAs("capitalize(test)").isEqualTo("Test")
+        assertThat(capitalize("Test")).describedAs("capitalize(Test)").isEqualTo("Test")
+        assertThat(capitalize(null)).describedAs("captitalize(null)").isNull()
+        assertThat(capitalize("")).describedAs("capitalize()").isEqualTo("")
     }
 
     @Test
     fun testColorize() {
-        assertThat(colorize(ascii, Colors.REVERSE)).`as`("colorize(reverse)").isEqualTo(
+        assertThat(colorize(ascii, Colors.REVERSE)).describedAs("colorize(reverse)").isEqualTo(
             Colors.REVERSE + ascii + Colors.REVERSE
         )
-        assertThat(colorize(ascii, Colors.RED)).`as`("colorize(red)").isEqualTo(Colors.RED + ascii + Colors.NORMAL)
-        assertThat(colorize(null, Colors.RED)).`as`("colorize(null)").isEqualTo(Colors.NORMAL)
+        assertThat(colorize(ascii, Colors.RED)).describedAs("colorize(red)")
+            .isEqualTo(Colors.RED + ascii + Colors.NORMAL)
+        assertThat(colorize(null, Colors.RED)).describedAs("colorize(null)").isEqualTo(Colors.NORMAL)
     }
 
     @Test
@@ -102,15 +103,15 @@ class UtilsTest {
 
     @Test
     fun testEnsureDir() {
-        assertThat(ensureDir("dir", false)).`as`("ensureDir(dir, false)").isEqualTo("dir" + File.separatorChar)
-        assertThat(ensureDir("https://erik.thauvin.net", true)).`as`("ensureDir(erik.thauvin.net, true)")
+        assertThat(ensureDir("dir", false)).describedAs("ensureDir(dir, false)").isEqualTo("dir" + File.separatorChar)
+        assertThat(ensureDir("https://erik.thauvin.net", true)).describedAs("ensureDir(erik.thauvin.net, true)")
             .isEqualTo("https://erik.thauvin.net/")
     }
 
     @Test
     fun testGetIntProperty() {
-        assertThat(getIntProperty("10", 1)).`as`("getIntProperty(10, 1)").isEqualTo(10)
-        assertThat(getIntProperty("a", 1)).`as`("getIntProperty(a, 1)").isEqualTo(1)
+        assertThat(getIntProperty("10", 1)).describedAs("getIntProperty(10, 1)").isEqualTo(10)
+        assertThat(getIntProperty("a", 1)).describedAs("getIntProperty(a, 1)").isEqualTo(1)
     }
 
     @Test
@@ -120,25 +121,25 @@ class UtilsTest {
 
     @Test
     fun testIsoLocalDate() {
-        assertThat(isoLocalDate(cal.time)).`as`("isoLocalDate(date)").isEqualTo("1952-02-17")
-        assertThat(isoLocalDate(localDateTime)).`as`("isoLocalDate(localDate)").isEqualTo("1952-02-17")
+        assertThat(isoLocalDate(cal.time)).describedAs("isoLocalDate(date)").isEqualTo("1952-02-17")
+        assertThat(isoLocalDate(localDateTime)).describedAs("isoLocalDate(localDate)").isEqualTo("1952-02-17")
     }
 
     @Test
     fun testObfuscate() {
-        assertThat(obfuscate(ascii).length).`as`("obfuscate is right length").isEqualTo(ascii.length)
-        assertThat(obfuscate(ascii)).`as`("obfuscate()").isEqualTo(StringUtils.repeat("x", ascii.length))
-        assertThat(obfuscate(" ")).`as`("obfuscate(blank)").isEqualTo(" ")
+        assertThat(obfuscate(ascii).length).describedAs("obfuscate is right length").isEqualTo(ascii.length)
+        assertThat(obfuscate(ascii)).describedAs("obfuscate()").isEqualTo(StringUtils.repeat("x", ascii.length))
+        assertThat(obfuscate(" ")).describedAs("obfuscate(blank)").isEqualTo(" ")
     }
 
     @Test
     fun testPlural() {
         val week = "week"
         val weeks = "weeks"
-        assertThat(plural(-1, week, weeks)).`as`("plural(-1)").isEqualTo(week)
-        assertThat(plural(0, week, weeks)).`as`("plural(0)").isEqualTo(week)
-        assertThat(plural(1, week, weeks)).`as`("plural(1)").isEqualTo(week)
-        assertThat(plural(2, week, weeks)).`as`("plural(2)").isEqualTo(weeks)
+        assertThat(plural(-1, week, weeks)).describedAs("plural(-1)").isEqualTo(week)
+        assertThat(plural(0, week, weeks)).describedAs("plural(0)").isEqualTo(week)
+        assertThat(plural(1, week, weeks)).describedAs("plural(1)").isEqualTo(week)
+        assertThat(plural(2, week, weeks)).describedAs("plural(2)").isEqualTo(weeks)
     }
 
     @Test
@@ -166,14 +167,14 @@ class UtilsTest {
     @Test
     @Throws(IOException::class)
     fun testUrlReader() {
-        assertThat(urlReader(URL("https://postman-echo.com/status/200"))).`as`("urlReader()").isEqualTo(
-            "{\"status\":200}"
+        assertThat(urlReader(URL("https://postman-echo.com/status/200"))).describedAs("urlReader()")
+            .isEqualTo("{\"status\":200}"
         )
     }
 
     @Test
     fun testUtcDateTime() {
-        assertThat(utcDateTime(cal.time)).`as`("utcDateTime(date)").isEqualTo("1952-02-17 12:30")
-        assertThat(utcDateTime(localDateTime)).`as`("utcDateTime(localDate)").isEqualTo("1952-02-17 12:30")
+        assertThat(utcDateTime(cal.time)).describedAs("utcDateTime(date)").isEqualTo("1952-02-17 12:30")
+        assertThat(utcDateTime(localDateTime)).describedAs("utcDateTime(localDate)").isEqualTo("1952-02-17 12:30")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index f0f0054..4fdd2db 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -51,17 +51,17 @@ class TellMessageTest {
         val recipient = "recipient"
         val sender = "sender"
         val tellMessage = TellMessage(sender, recipient, message)
-        assertThat(tellMessage.sender).`as`(sender).isEqualTo(sender)
-        assertThat(tellMessage.recipient).`as`(recipient).isEqualTo(recipient)
-        assertThat(tellMessage.message).`as`(message).isEqualTo(message)
-        assertThat(isValidDate(tellMessage.queued)).`as`("queued is valid date/time").isTrue
-        assertThat(tellMessage.isMatch(sender)).`as`("match sender").isTrue
-        assertThat(tellMessage.isMatch(recipient)).`as`("match recipient").isTrue
-        assertThat(tellMessage.isMatch("foo")).`as`("foo is no match").isFalse
+        assertThat(tellMessage.sender).describedAs(sender).isEqualTo(sender)
+        assertThat(tellMessage.recipient).describedAs(recipient).isEqualTo(recipient)
+        assertThat(tellMessage.message).describedAs(message).isEqualTo(message)
+        assertThat(isValidDate(tellMessage.queued)).describedAs("queued is valid date/time").isTrue
+        assertThat(tellMessage.isMatch(sender)).describedAs("match sender").isTrue
+        assertThat(tellMessage.isMatch(recipient)).describedAs("match recipient").isTrue
+        assertThat(tellMessage.isMatch("foo")).describedAs("foo is no match").isFalse
         tellMessage.isReceived = true
-        assertThat(tellMessage.isReceived).`as`("is received").isTrue
-        assertThat(isValidDate(tellMessage.receptionDate)).`as`("received is valid date/time").isTrue
+        assertThat(tellMessage.isReceived).describedAs("is received").isTrue
+        assertThat(isValidDate(tellMessage.receptionDate)).describedAs("received is valid date/time").isTrue
         tellMessage.isNotified = true
-        assertThat(tellMessage.isNotified).`as`("is notified").isTrue
+        assertThat(tellMessage.isNotified).describedAs("is notified").isTrue
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
index dcb9378..b6a83dc 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -56,37 +56,37 @@ class EntryLinkTest {
             entryLink.addComment("c$i", "u$i")
             i++
         }
-        assertThat(entryLink.comments.size).`as`("getComments().size() == 5").isEqualTo(i)
+        assertThat(entryLink.comments.size).describedAs("getComments().size() == 5").isEqualTo(i)
         i = 0
         for (comment in entryLink.comments) {
-            assertThat(comment.comment).`as`("getComment($i)").isEqualTo("c$i")
-            assertThat(comment.nick).`as`("getNick($i)").isEqualTo("u$i")
+            assertThat(comment.comment).describedAs("getComment($i)").isEqualTo("c$i")
+            assertThat(comment.nick).describedAs("getNick($i)").isEqualTo("u$i")
             i++
         }
         val r = SecureRandom()
         while (entryLink.comments.size > 0) {
             entryLink.deleteComment(r.nextInt(entryLink.comments.size))
         }
-        assertThat(entryLink.comments.isNotEmpty()).`as`("hasComments()").isFalse
+        assertThat(entryLink.comments.isNotEmpty()).describedAs("hasComments()").isFalse
         entryLink.addComment("nothing", "nobody")
         entryLink.setComment(0, "something", "somebody")
-        assertThat(entryLink.getComment(0).nick).`as`("getNick(somebody)").isEqualTo("somebody")
-        assertThat(entryLink.getComment(0).comment).`as`("getComment(something)").isEqualTo("something")
+        assertThat(entryLink.getComment(0).nick).describedAs("getNick(somebody)").isEqualTo("somebody")
+        assertThat(entryLink.getComment(0).comment).describedAs("getComment(something)").isEqualTo("something")
     }
 
     @Test
     fun testTags() {
         val tags: List<SyndCategory> = entryLink.tags
         for ((i, tag) in tags.withIndex()) {
-            assertThat(tag.name).`as`("tag.getName($i)").isEqualTo("tag" + (i + 1))
+            assertThat(tag.name).describedAs("tag.getName($i)").isEqualTo("tag" + (i + 1))
         }
-        assertThat(entryLink.tags.size).`as`("getTags().size() is 5").isEqualTo(5)
-        assertThat(entryLink.tags.isNotEmpty()).`as`("hasTags() is true").isTrue
+        assertThat(entryLink.tags.size).describedAs("getTags().size() is 5").isEqualTo(5)
+        assertThat(entryLink.tags.isNotEmpty()).describedAs("hasTags() is true").isTrue
         entryLink.setTags("-tag5")
         entryLink.setTags("+mobitopia")
         entryLink.setTags("tag4")
         entryLink.setTags("-mobitopia")
-        assertThat(entryLink.pinboardTags).`as`("getPinboardTags()")
+        assertThat(entryLink.pinboardTags).describedAs("getPinboardTags()")
             .isEqualTo(entryLink.nick + ",tag1,tag2,tag3,tag4,mobitopia")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
index a397f5a..4064672 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -44,10 +44,11 @@ import org.testng.annotations.Test
 class CalcTest {
     @Test
     fun testCalculate() {
-        assertThat(calculate("1 + 1")).`as`("calculate(1+1)").isEqualTo("1+1 = %s", Utils.bold(2))
-        assertThat(calculate("1 -3")).`as`("calculate(1 -3)").isEqualTo("1-3 = %s", Utils.bold(-2))
-        assertThat(calculate("pi+π+e+φ")).`as`("calculate(pi+π+e+φ)").isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"))
-        assertThatThrownBy { calculate("one + one") }.`as`("calculate(one+one)")
-                        .isInstanceOf(UnknownFunctionOrVariableException::class.java)
+        assertThat(calculate("1 + 1")).describedAs("calculate(1+1)").isEqualTo("1+1 = %s", Utils.bold(2))
+        assertThat(calculate("1 -3")).describedAs("calculate(1 -3)").isEqualTo("1-3 = %s", Utils.bold(-2))
+        assertThat(calculate("pi+π+e+φ")).describedAs("calculate(pi+π+e+φ)")
+            .isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"))
+        assertThatThrownBy { calculate("one + one") }.describedAs("calculate(one+one)")
+            .isInstanceOf(UnknownFunctionOrVariableException::class.java)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
index bd07f1c..baed49c 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
@@ -31,9 +31,8 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.crypto.CryptoPrice.Companion.marketPrice
 import net.thauvin.erik.crypto.CryptoException
-import net.thauvin.erik.mobibot.LocalProperties
+import net.thauvin.erik.crypto.CryptoPrice.Companion.marketPrice
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
@@ -46,28 +45,28 @@ class CryptoPricesTest {
     @Throws(ModuleException::class)
     fun testMarketPrice() {
         var price = marketPrice("BTC", "USD")
-        assertThat(price.base).`as`("is BTC").isEqualTo("BTC")
-        assertThat(price.currency).`as`("is USD").isEqualTo("USD")
-        assertThat(price.amount).`as`("BTC > 0").isGreaterThan(0.00)
+        assertThat(price.base).describedAs("is BTC").isEqualTo("BTC")
+        assertThat(price.currency).describedAs("is USD").isEqualTo("USD")
+        assertThat(price.amount).describedAs("BTC > 0").isGreaterThan(0.00)
 
         price = marketPrice("ETH", "EUR")
-        assertThat(price.base).`as`("is ETH").isEqualTo("ETH")
-        assertThat(price.currency).`as`("is EUR").isEqualTo("EUR")
-        assertThat(price.amount).`as`("ETH > 0").isGreaterThan(0.00)
+        assertThat(price.base).describedAs("is ETH").isEqualTo("ETH")
+        assertThat(price.currency).describedAs("is EUR").isEqualTo("EUR")
+        assertThat(price.amount).describedAs("ETH > 0").isGreaterThan(0.00)
 
         price = marketPrice("ETH2", "GBP")
-        assertThat(price.base).`as`("is ETH2").isEqualTo("ETH2")
-        assertThat(price.currency).`as`("is GBP").isEqualTo("GBP")
-        assertThat(price.amount).`as`("ETH2 > 0").isGreaterThan(0.00)
+        assertThat(price.base).describedAs("is ETH2").isEqualTo("ETH2")
+        assertThat(price.currency).describedAs("is GBP").isEqualTo("GBP")
+        assertThat(price.amount).describedAs("ETH2 > 0").isGreaterThan(0.00)
 
         assertThatThrownBy { marketPrice("FOO", "USD") }
-                .`as`("FOO")
-                .isInstanceOf(CryptoException::class.java)
-                .hasMessageContaining("Invalid base currency")
+            .describedAs("FOO")
+            .isInstanceOf(CryptoException::class.java)
+            .hasMessageContaining("Invalid base currency")
 
         assertThatThrownBy { marketPrice("FOO", "BAR") }
-                .`as`("FOO-BAR")
-                .isInstanceOf(CryptoException::class.java)
-                .hasMessageContaining("Invalid currency (BAR)")
+            .describedAs("FOO-BAR")
+            .isInstanceOf(CryptoException::class.java)
+            .hasMessageContaining("Invalid currency (BAR)")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
index 0fbfedd..5d509d3 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
@@ -51,10 +51,11 @@ class CurrencyConverterTest {
     @Test
     fun testConvertCurrency() {
         assertThat(convertCurrency("100 USD to EUR").msg)
-            .`as`("100 USD to EUR").matches("100\\.00 USD = \\d{2,3}\\.\\d{2} EUR")
-        assertThat(convertCurrency("100 USD to USD").msg).`as`("100 USD to USD").contains("You're kidding, right?")
-        assertThat(convertCurrency("100 USD").msg).`as`("100 USD").contains("Invalid query.")
-        assertThat(currencyRates().size).`as`("currencyRates().size() == 33").isEqualTo(33)
-        assertThat(currencyRates()).`as`("currencyRates().get(EUR)").contains("  EUR:        1")
+            .describedAs("100 USD to EUR").matches("100\\.00 USD = \\d{2,3}\\.\\d{2} EUR")
+        assertThat(convertCurrency("100 USD to USD").msg).describedAs("100 USD to USD")
+            .contains("You're kidding, right?")
+        assertThat(convertCurrency("100 USD").msg).describedAs("100 USD").contains("Invalid query.")
+        assertThat(currencyRates().size).describedAs("currencyRates().size() == 33").isEqualTo(33)
+        assertThat(currencyRates()).describedAs("currencyRates().get(EUR)").contains("  EUR:        1")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
index cea3e35..681dc5b 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
@@ -39,8 +39,8 @@ import org.testng.annotations.Test
 class DiceTest {
     @Test
     fun testWinLoseOrTie() {
-        assertThat(Dice.winLoseOrTie(6, 6)).`as`("6 vs. 6").isEqualTo(Dice.Result.TIE)
-        assertThat(Dice.winLoseOrTie(6, 5)).`as`("6 vs. 5").isEqualTo(Dice.Result.WIN)
-        assertThat(Dice.winLoseOrTie(5, 6)).`as`("5 vs. 6").isEqualTo(Dice.Result.LOSE)
+        assertThat(Dice.winLoseOrTie(6, 6)).describedAs("6 vs. 6").isEqualTo(Dice.Result.TIE)
+        assertThat(Dice.winLoseOrTie(6, 5)).describedAs("6 vs. 5").isEqualTo(Dice.Result.WIN)
+        assertThat(Dice.winLoseOrTie(5, 6)).describedAs("5 vs. 6").isEqualTo(Dice.Result.LOSE)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index 4d8abd5..fd34802 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -48,19 +48,19 @@ class GoogleSearchTest : LocalProperties() {
         val cseKey = getProperty(GoogleSearch.GOOGLE_CSE_KEY_PROP)
         try {
             var messages = searchGoogle("mobitopia", apiKey, cseKey)
-            assertThat(messages).`as`("mobitopia results not empty").isNotEmpty
-            assertThat(messages[0].msg).`as`("found freenode").contains("freenode")
+            assertThat(messages).describedAs("mobitopia results not empty").isNotEmpty
+            assertThat(messages[0].msg).describedAs("found freenode").contains("freenode")
             messages = searchGoogle("aapl", apiKey, cseKey)
-            assertThat(messages).`as`("aapl results not empty").isNotEmpty
-            assertThat(messages[0].msg).`as`("found apple").containsIgnoringCase("apple")
+            assertThat(messages).describedAs("aapl results not empty").isNotEmpty
+            assertThat(messages[0].msg).describedAs("found apple").containsIgnoringCase("apple")
             assertThatThrownBy { searchGoogle("test", "", "apiKey") }
-                .`as`("no API key")
+                .describedAs("no API key")
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
             assertThatThrownBy { searchGoogle("test", "apiKey", "") }
-                .`as`("no CSE API key")
+                .describedAs("no CSE API key")
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
             assertThatThrownBy { searchGoogle("", "apikey", "apiKey") }
-                .`as`("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
+                .describedAs("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
             if ("true" == System.getenv("CI") && apiKey.isNotBlank() && cseKey.isNotBlank()) {
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
index 36156e2..073d089 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
@@ -42,7 +42,7 @@ class JokeTest {
     @Test
     @Throws(ModuleException::class)
     fun testRamdomJoke() {
-        assertThat(randomJoke().msg.isNotEmpty()).`as`("randomJoke() > 0").isTrue
-        assertThat(randomJoke().msg).`as`("randomJoke()").containsIgnoringCase("chuck")
+        assertThat(randomJoke().msg.isNotEmpty()).describedAs("randomJoke() > 0").isTrue
+        assertThat(randomJoke().msg).describedAs("randomJoke()").containsIgnoringCase("chuck")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
index 3b94181..9fbf64c 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -44,7 +44,7 @@ class LookupTest {
     @Throws(Exception::class)
     fun testLookup() {
         val result = nslookup("apple.com")
-        assertThat(result).`as`("lookup(apple.com)").contains("17.253.144.10")
+        assertThat(result).describedAs("lookup(apple.com)").contains("17.253.144.10")
     }
 
     @Test
@@ -52,6 +52,6 @@ class LookupTest {
     fun testWhois() {
         val result = whois("17.178.96.59", Lookup.WHOIS_HOST)
         assertThat(result.stream().anyMatch { m: String -> m.contains("Apple Inc.") })
-            .`as`("whois(17.178.96.59/Apple Inc.").isTrue
+            .describedAs("whois(17.178.96.59/Apple Inc.").isTrue
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
index e49da97..c2d61e3 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
@@ -50,7 +50,7 @@ class ModuleExceptionTest {
     fun createData(@Suppress("UNUSED_PARAMETER") m: Method?): Array<Array<Any>> {
         return arrayOf(
             arrayOf(ModuleException(debugMessage, message, IOException("URL http://foobar.com"))),
-            arrayOf(ModuleException(debugMessage,message,IOException("URL http://foobar.com?"))),
+            arrayOf(ModuleException(debugMessage, message, IOException("URL http://foobar.com?"))),
             arrayOf(ModuleException(debugMessage, message))
         )
     }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
index b849192..1eba3b7 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
@@ -41,13 +41,13 @@ import org.testng.annotations.Test
 class PingTest {
     @Test
     fun testPingsArray() {
-        assertThat(Ping.PINGS).`as`("Pings array is not empty.").isNotEmpty
+        assertThat(Ping.PINGS).describedAs("Pings array is not empty.").isNotEmpty
     }
 
     @Test
     fun testRandomPing() {
         for (i in 0..9) {
-            assertThat(randomPing()).`as`("Random ping $i").isIn(Ping.PINGS)
+            assertThat(randomPing()).describedAs("Random ping $i").isIn(Ping.PINGS)
         }
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
index 34cf7bb..3f5352f 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
@@ -38,13 +38,17 @@ import org.testng.annotations.Test
 class RockPaperScissorsTest {
     @Test
     fun testWinLoseOrDraw() {
-        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "paper")).`as`("scissors vs. paper").isEqualTo("win")
-        assertThat(RockPaperScissors.winLoseOrDraw("paper", "rock")).`as`("paper vs. rock").isEqualTo("win")
-        assertThat(RockPaperScissors.winLoseOrDraw("rock", "scissors")).`as`("rock vs. scissors").isEqualTo("win")
-        assertThat(RockPaperScissors.winLoseOrDraw("paper", "scissors")).`as`("paper vs. scissors").isEqualTo("lose")
-        assertThat(RockPaperScissors.winLoseOrDraw("rock", "paper")).`as`("rock vs. paper").isEqualTo("lose")
-        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "rock")).`as`("scissors vs. rock").isEqualTo("lose")
+        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "paper")).describedAs("scissors vs. paper")
+            .isEqualTo("win")
+        assertThat(RockPaperScissors.winLoseOrDraw("paper", "rock")).describedAs("paper vs. rock").isEqualTo("win")
+        assertThat(RockPaperScissors.winLoseOrDraw("rock", "scissors")).describedAs("rock vs. scissors")
+            .isEqualTo("win")
+        assertThat(RockPaperScissors.winLoseOrDraw("paper", "scissors")).describedAs("paper vs. scissors")
+            .isEqualTo("lose")
+        assertThat(RockPaperScissors.winLoseOrDraw("rock", "paper")).describedAs("rock vs. paper").isEqualTo("lose")
+        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "rock")).describedAs("scissors vs. rock")
+            .isEqualTo("lose")
         assertThat(RockPaperScissors.winLoseOrDraw("scissors", "scissors"))
-            .`as`("scissors vs. scissors").isEqualTo("draw")
+            .describedAs("scissors vs. scissors").isEqualTo("draw")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index c12b33e..60875cf 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -47,17 +47,17 @@ class StockQuoteTest : LocalProperties() {
         val apiKey = getProperty(StockQuote.ALPHAVANTAGE_API_KEY_PROP)
         try {
             val messages = getQuote("apple inc", apiKey)
-            assertThat(messages).`as`("response not empty").isNotEmpty
-            assertThat(messages[0].msg).`as`("same stock symbol").startsWith("Symbol: AAPL")
-            assertThat(messages[1].msg).`as`("price label").startsWith("    Price:     ")
+            assertThat(messages).describedAs("response not empty").isNotEmpty
+            assertThat(messages[0].msg).describedAs("same stock symbol").startsWith("Symbol: AAPL")
+            assertThat(messages[1].msg).describedAs("price label").startsWith("    Price:     ")
             try {
                 getQuote("blahfoo", apiKey)
             } catch (e: ModuleException) {
-                assertThat(e.message).`as`("invalid symbol").containsIgnoringCase(StockQuote.INVALID_SYMBOL)
+                assertThat(e.message).describedAs("invalid symbol").containsIgnoringCase(StockQuote.INVALID_SYMBOL)
             }
-            assertThatThrownBy { getQuote("test", "") }.`as`("no API key")
+            assertThatThrownBy { getQuote("test", "") }.describedAs("no API key")
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
-            assertThatThrownBy { getQuote("", "apikey") }.`as`("no symbol")
+            assertThatThrownBy { getQuote("", "apikey") }.describedAs("no symbol")
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
index 10a9d79..ce5c36d 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
@@ -66,6 +66,6 @@ class TwitterTest : LocalProperties() {
                 msg,
                 true
             ).msg
-        ).`as`("twitterPost($msg)").isEqualTo(msg)
+        ).describedAs("twitterPost($msg)").isEqualTo(msg)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
index 0d9570c..23d9b16 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
@@ -46,16 +46,16 @@ class Weather2Test : LocalProperties() {
     @Throws(ModuleException::class)
     fun testWeather() {
         var messages = getWeather("98204", getProperty(Weather2.OWM_API_KEY_PROP))
-        assertThat(messages[0].msg).`as`("is Everett").contains("Everett").contains("US")
-        assertThat(messages[messages.size - 1].msg).`as`("is City Search").endsWith("98204%2CUS")
+        assertThat(messages[0].msg).describedAs("is Everett").contains("Everett").contains("US")
+        assertThat(messages[messages.size - 1].msg).describedAs("is City Search").endsWith("98204%2CUS")
         messages = getWeather("London, UK", getProperty(Weather2.OWM_API_KEY_PROP))
-        assertThat(messages[0].msg).`as`("is UK").contains("London").contains("UK")
-        assertThat(messages[messages.size - 1].msg).`as`("is City Code").endsWith("4517009")
+        assertThat(messages[0].msg).describedAs("is UK").contains("London").contains("UK")
+        assertThat(messages[messages.size - 1].msg).describedAs("is City Code").endsWith("4517009")
         assertThatThrownBy { getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP)) }
-            .`as`("Montpellier not found").hasCauseInstanceOf(APIException::class.java)
+            .describedAs("Montpellier not found").hasCauseInstanceOf(APIException::class.java)
         assertThatThrownBy { getWeather("test", "") }
-            .`as`("no API key").isInstanceOf(ModuleException::class.java).hasNoCause()
+            .describedAs("no API key").isInstanceOf(ModuleException::class.java).hasNoCause()
         messages = getWeather("", "apikey")
-        assertThat(messages[0].isError).`as`("no query").isTrue
+        assertThat(messages[0].isError).describedAs("no query").isTrue
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index 4243383..d0c3e00 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -42,8 +42,8 @@ import org.testng.annotations.Test
 class WordTimeTest {
     @Test
     fun testTime() {
-        assertThat(time("PST").msg).`as`("PST").endsWith(Utils.bold("Los Angeles"))
-        assertThat(time("BLAH").isError).`as`("BLAH").isTrue
-        assertThat(time("BEATS").msg).`as`("BEATS").contains("@")
+        assertThat(time("PST").msg).describedAs("PST").endsWith(Utils.bold("Los Angeles"))
+        assertThat(time("BLAH").isError).describedAs("BLAH").isTrue
+        assertThat(time("BEATS").msg).describedAs("BEATS").contains("@")
     }
 }
diff --git a/version.properties b/version.properties
index e7931a0..0d16bd8 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 11 00:11:43 PDT 2021
-version.buildmeta=720
+#Tue May 11 00:47:17 PDT 2021
+version.buildmeta=722
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+720
+version.semver=0.8.0-beta+722

From 273ac60c7db70bfcc590562f0c67b2b450d25145 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 11 May 2021 01:47:41 -0700
Subject: [PATCH 152/262] Fixed CryptoPrices tests.

---
 .../erik/mobibot/modules/CryptoPrices.kt      | 37 +++++++------------
 .../erik/mobibot/modules/CryptoPricesTest.kt  | 23 ++----------
 version.properties                            |  6 +--
 3 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index 20c42b8..a1313a0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -31,36 +31,17 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import net.thauvin.erik.crypto.CryptoPrice.Companion.marketPrice
 import net.thauvin.erik.crypto.CryptoException
+import net.thauvin.erik.crypto.CryptoPrice
+import net.thauvin.erik.crypto.CryptoPrice.Companion.marketPrice
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils
-import net.thauvin.erik.mobibot.msg.ErrorMessage
-import net.thauvin.erik.mobibot.msg.Message
-import net.thauvin.erik.mobibot.msg.NoticeMessage
 import net.thauvin.erik.mobibot.msg.PublicMessage
-import org.json.JSONException
-import org.json.JSONObject
-import java.io.IOException
-import java.net.URL
-import java.text.DecimalFormat
-import java.time.format.DateTimeFormatter
-import java.time.Instant
-import java.time.temporal.ChronoUnit
-import java.time.ZoneId
-import java.time.ZoneOffset
-
-data class Price(val base: String, val currency: String, val amount: Double)
 
 /**
  * The Cryptocurrency Prices  module.
  */
 class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
-    val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneOffset.UTC)
-    val decimalFormat = DecimalFormat("0.00")
-
     /**
      * Returns the cryptocurrency market price from [Coinbase](https://developers.coinbase.com/api/v2#get-spot-price).
      */
@@ -68,10 +49,8 @@ class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
         val debugMessage = "crypto($cmd $args)"
         with(bot) {
             if (args.matches("\\w+( [a-zA-Z]{3}+)?".toRegex())) {
-                val params = args.trim().split(" ");
                 try {
-                    val currency = if (params.size == 2) params[1] else "USD"
-                    val price = marketPrice(params[0], currency)
+                    val price = currentPrice(args.split(' '))
                     send(sender, PublicMessage("${price.base}: ${price.amount} [${price.currency}]"))
                 } catch (e: CryptoException) {
                     if (logger.isWarnEnabled) logger.warn("$debugMessage => ${e.statusCode}", e)
@@ -89,6 +68,16 @@ class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
     companion object {
         // Crypto command
         private const val CRYPTO_CMD = "crypto"
+
+        /**
+         * Get current market price.
+         */
+        fun currentPrice(args: List<String>): CryptoPrice {
+            return if (args.size == 2)
+                marketPrice(args[0], args[1])
+            else
+                marketPrice(args[0])
+        }
     }
 
     init {
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
index baed49c..f046b59 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
@@ -31,10 +31,8 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.crypto.CryptoException
-import net.thauvin.erik.crypto.CryptoPrice.Companion.marketPrice
+import net.thauvin.erik.mobibot.modules.CryptoPrices.Companion.currentPrice
 import org.assertj.core.api.Assertions.assertThat
-import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
 
 /**
@@ -44,29 +42,14 @@ class CryptoPricesTest {
     @Test
     @Throws(ModuleException::class)
     fun testMarketPrice() {
-        var price = marketPrice("BTC", "USD")
+        var price = currentPrice(listOf("BTC"))
         assertThat(price.base).describedAs("is BTC").isEqualTo("BTC")
         assertThat(price.currency).describedAs("is USD").isEqualTo("USD")
         assertThat(price.amount).describedAs("BTC > 0").isGreaterThan(0.00)
 
-        price = marketPrice("ETH", "EUR")
+        price = currentPrice(listOf("ETH", "EUR"))
         assertThat(price.base).describedAs("is ETH").isEqualTo("ETH")
         assertThat(price.currency).describedAs("is EUR").isEqualTo("EUR")
         assertThat(price.amount).describedAs("ETH > 0").isGreaterThan(0.00)
-
-        price = marketPrice("ETH2", "GBP")
-        assertThat(price.base).describedAs("is ETH2").isEqualTo("ETH2")
-        assertThat(price.currency).describedAs("is GBP").isEqualTo("GBP")
-        assertThat(price.amount).describedAs("ETH2 > 0").isGreaterThan(0.00)
-
-        assertThatThrownBy { marketPrice("FOO", "USD") }
-            .describedAs("FOO")
-            .isInstanceOf(CryptoException::class.java)
-            .hasMessageContaining("Invalid base currency")
-
-        assertThatThrownBy { marketPrice("FOO", "BAR") }
-            .describedAs("FOO-BAR")
-            .isInstanceOf(CryptoException::class.java)
-            .hasMessageContaining("Invalid currency (BAR)")
     }
 }
diff --git a/version.properties b/version.properties
index 0d16bd8..be3f7f2 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 11 00:47:17 PDT 2021
-version.buildmeta=722
+#Tue May 11 01:30:42 PDT 2021
+version.buildmeta=726
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+722
+version.semver=0.8.0-beta+726

From a7988001983b09f58ff0e07e8c1e9ce3f03b2794 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 11 May 2021 12:42:46 -0700
Subject: [PATCH 153/262] Cleaned up usage of the Utils class.

---
 .../thauvin/erik/mobibot/commands/ChannelFeed.kt  |  7 ++-----
 .../net/thauvin/erik/mobibot/commands/Cycle.kt    |  4 ++--
 .../net/thauvin/erik/mobibot/commands/Me.kt       |  7 ++-----
 .../net/thauvin/erik/mobibot/commands/Modules.kt  |  7 ++-----
 .../net/thauvin/erik/mobibot/commands/Msg.kt      |  4 ++--
 .../net/thauvin/erik/mobibot/commands/Nick.kt     |  7 ++-----
 .../net/thauvin/erik/mobibot/commands/Say.kt      |  7 ++-----
 .../net/thauvin/erik/mobibot/commands/Users.kt    |  7 ++-----
 .../erik/mobibot/commands/links/Comment.kt        | 13 +++++++------
 .../erik/mobibot/commands/links/Posting.kt        | 15 ++++++++-------
 .../thauvin/erik/mobibot/commands/links/Tags.kt   |  4 ++--
 .../thauvin/erik/mobibot/commands/links/View.kt   |  7 ++++---
 .../erik/mobibot/modules/AbstractModule.kt        |  4 ++--
 .../net/thauvin/erik/mobibot/modules/Calc.kt      |  7 ++++---
 .../thauvin/erik/mobibot/modules/CryptoPrices.kt  | 10 +++++-----
 .../net/thauvin/erik/mobibot/modules/Dice.kt      | 13 +++++++------
 .../net/thauvin/erik/mobibot/modules/Lookup.kt    |  4 ++--
 .../erik/mobibot/modules/ModuleException.kt       |  4 ++--
 .../net/thauvin/erik/mobibot/modules/Ping.kt      |  4 ++--
 .../net/thauvin/erik/mobibot/modules/Twitter.kt   |  4 ++--
 .../net/thauvin/erik/mobibot/modules/WorldTime.kt | 13 +++++++------
 version.properties                                |  6 +++---
 22 files changed, 73 insertions(+), 85 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index 637aec5..9c50932 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -34,14 +34,11 @@ package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.FeedReader
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
     override val name = channel
-    override val help = listOf(
-        "To list the last 5 posts from the channel's weblog feed:",
-        Utils.helpFormat("%c $channel")
-    )
+    override val help = listOf("To list the last 5 posts from the channel's weblog feed:", helpFormat("%c $channel"))
     override val isOp = false
     override val isPublic = true
     override val isVisible = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
index 32c06e5..88de89b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -33,13 +33,13 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Cycle(bot: Mobibot) : AbstractCommand(bot) {
     @Suppress("MagicNumber")
     private val wait = 10
     override val name = "cycle"
-    override val help = listOf("To have the bot leave the channel and come back:", Utils.helpFormat("%c $name"))
+    override val help = listOf("To have the bot leave the channel and come back:", helpFormat("%c $name"))
     override val isOp = true
     override val isPublic = false
     override val isVisible = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
index c668fe0..4b996f1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
@@ -33,14 +33,11 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Me(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "me"
-    override val help = listOf(
-        "To have the bot perform an action:",
-        Utils.helpFormat("%c $name <action>")
-    )
+    override val help = listOf("To have the bot perform an action:", helpFormat("%c $name <action>"))
     override val isOp = true
     override val isPublic = false
     override val isVisible = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
index 50ddc93..2bd43c9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -33,14 +33,11 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Modules(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "modules"
-    override val help = listOf(
-        "To view a list of enabled modules:",
-        Utils.helpFormat("%c $name")
-    )
+    override val help = listOf("To view a list of enabled modules:", helpFormat("%c $name"))
     override val isOp = true
     override val isPublic = false
     override val isVisible = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
index 4e7aa4d..5e9b5ae 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -33,13 +33,13 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Msg(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "msg"
     override val help = listOf(
         "To have the bot send a private message to someone:",
-        Utils.helpFormat("%c $name <nick> <text>")
+        helpFormat("%c $name <nick> <text>")
     )
     override val isOp = true
     override val isPublic = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
index fa1ff2c..b4495b3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -33,14 +33,11 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Nick(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "nick"
-    override val help = listOf(
-        "To change the bot's nickname:",
-        Utils.helpFormat("%c $name <nick>")
-    )
+    override val help = listOf("To change the bot's nickname:", helpFormat("%c $name <nick>"))
     override val isOp = true
     override val isPublic = true
     override val isVisible = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
index af08502..198ea8c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
@@ -33,14 +33,11 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Say(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "say"
-    override val help = listOf(
-        "To have the bot say something on the channel:",
-        Utils.helpFormat("%c $name <text>")
-    )
+    override val help = listOf("To have the bot say something on the channel:", helpFormat("%c $name <text>"))
     override val isOp = true
     override val isPublic = false
     override val isVisible = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
index 1d1ec6e..4db1781 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
@@ -33,14 +33,11 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Users(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "users"
-    override val help = listOf(
-        "To list the users present on the channel:",
-        Utils.helpFormat("%c $name")
-    )
+    override val help = listOf("To list the users present on the channel:", helpFormat("%c $name"))
     override val isOp = false
     override val isPublic = true
     override val isVisible = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 9a8685a..ebe7067 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -34,7 +34,8 @@ package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
@@ -43,12 +44,12 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
     override val name = COMMAND
     override val help = listOf(
         "To add a comment:",
-        Utils.helpFormat("${Constants.LINK_CMD}1:This is a comment"),
-        "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
+        helpFormat("${Constants.LINK_CMD}1:This is a comment"),
+        "I will reply with a label, for example: ${bold(Constants.LINK_CMD)}1.1",
         "To edit a comment, use its label: ",
-        Utils.helpFormat("${Constants.LINK_CMD}1.1:This is an edited comment"),
+        helpFormat("${Constants.LINK_CMD}1.1:This is an edited comment"),
         "To delete a comment, use its label and a minus sign: ",
-        Utils.helpFormat("${Constants.LINK_CMD}1.1:-")
+        helpFormat("${Constants.LINK_CMD}1.1:-")
     )
     override val isOp = false
     override val isPublic = true
@@ -99,7 +100,7 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
                 bot.send(sender, "To change a comment's author:", isPrivate)
                 bot.send(
                     sender,
-                    Utils.helpFormat("${Constants.LINK_CMD}1.1:?<nick>"),
+                    helpFormat("${Constants.LINK_CMD}1.1:?<nick>"),
                     isPrivate
                 )
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
index ef993cb..77c9b43 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -34,7 +34,8 @@ package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entries
 import net.thauvin.erik.mobibot.entries.EntriesUtils
@@ -44,15 +45,15 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "posting"
     override val help = listOf(
         "Post a URL, by saying it on a line on its own:",
-        Utils.helpFormat("<url> [<title>] ${Tags.COMMAND}: <+tag> [...]]"),
-        "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1",
+        helpFormat("<url> [<title>] ${Tags.COMMAND}: <+tag> [...]]"),
+        "I will reply with a label, for example: ${bold(Constants.LINK_CMD)}1",
         "To add a title, use its label and a pipe:",
-        Utils.helpFormat("${Constants.LINK_CMD}1:|This is the title"),
+        helpFormat("${Constants.LINK_CMD}1:|This is the title"),
         "To add a comment:",
-        Utils.helpFormat("${Constants.LINK_CMD}1:This is a comment"),
-        "I will reply with a label, for example: ${Utils.bold(Constants.LINK_CMD)}1.1",
+        helpFormat("${Constants.LINK_CMD}1:This is a comment"),
+        "I will reply with a label, for example: ${bold(Constants.LINK_CMD)}1.1",
         "To edit a comment, see: ",
-        Utils.helpFormat("%c ${Constants.HELP_CMD} ${Comment.COMMAND}")
+        helpFormat("%c ${Constants.HELP_CMD} ${Comment.COMMAND}")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
index 1481166..554d6c8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -34,7 +34,7 @@ package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
@@ -43,7 +43,7 @@ class Tags(bot: Mobibot) : AbstractCommand(bot) {
     override val name = COMMAND
     override val help = listOf(
         "To categorize or tag a URL, use its label and a T:",
-        Utils.helpFormat("${Constants.LINK_CMD}1T:<+tag|-tag> [...]")
+        helpFormat("${Constants.LINK_CMD}1T:<+tag|-tag> [...]")
     )
     override val isOp = false
     override val isPublic = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
index 0627d93..45da0f5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -33,7 +33,8 @@
 package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entries
 import net.thauvin.erik.mobibot.entries.EntriesUtils
@@ -45,7 +46,7 @@ class View(bot: Mobibot) : AbstractCommand(bot) {
     override val name = VIEW_CMD
     override val help = listOf(
         "To list or search the current URL posts:",
-        Utils.helpFormat("%c $name [<start>] [<query>]")
+        helpFormat("%c $name [<start>] [<query>]")
     )
     override val isOp = false
     override val isPublic = true
@@ -109,7 +110,7 @@ class View(bot: Mobibot) : AbstractCommand(bot) {
             i++
             if (sent == maxEntries && i < max) {
                 bot.send(
-                    sender, "To view more, try: " + Utils.bold("${bot.nick}: $name ${i + 1} $lcArgs"), false
+                    sender, "To view more, try: " + bold("${bot.nick}: $name ${i + 1} $lcArgs"), false
                 )
             }
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index 3448fa8..3c46fb4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 
 /**
  * The `Module` abstract class.
@@ -76,7 +76,7 @@ abstract class AbstractModule(val bot: Mobibot) {
      */
     open fun helpResponse(sender: String, isPrivate: Boolean): Boolean {
         for (h in help) {
-            bot.send(sender, Utils.buildCmdSyntax(h, bot.nick, isPrivateMsgEnabled && isPrivate), isPrivate)
+            bot.send(sender, buildCmdSyntax(h, bot.nick, isPrivateMsgEnabled && isPrivate), isPrivate)
         }
         return true
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
index 9704461..a197391 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -34,7 +34,8 @@ package net.thauvin.erik.mobibot.modules
 import net.objecthunter.exp4j.ExpressionBuilder
 import net.objecthunter.exp4j.tokenizer.UnknownFunctionOrVariableException
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import java.text.DecimalFormat
 
 /**
@@ -74,13 +75,13 @@ class Calc(bot: Mobibot) : AbstractModule(bot) {
         fun calculate(query: String): String {
             val decimalFormat = DecimalFormat("#.##")
             val calc = ExpressionBuilder(query).build()
-            return query.replace(" ", "") + " = " + Utils.bold(decimalFormat.format(calc.evaluate()))
+            return query.replace(" ", "") + " = " + bold(decimalFormat.format(calc.evaluate()))
         }
     }
 
     init {
         commands.add(CALC_CMD)
         help.add("To solve a mathematical calculation:")
-        help.add(Utils.helpFormat("%c $CALC_CMD <calculation>"))
+        help.add(helpFormat("%c $CALC_CMD <calculation>"))
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index a1313a0..4cd57c2 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -35,7 +35,7 @@ import net.thauvin.erik.crypto.CryptoException
 import net.thauvin.erik.crypto.CryptoPrice
 import net.thauvin.erik.crypto.CryptoPrice.Companion.marketPrice
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.msg.PublicMessage
 
 /**
@@ -83,10 +83,10 @@ class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(CRYPTO_CMD)
         help.add("To retrieve a cryptocurrency's market price:")
-        help.add(Utils.helpFormat("%c $CRYPTO_CMD <symbol> [<currency>]"))
+        help.add(helpFormat("%c $CRYPTO_CMD <symbol> [<currency>]"))
         help.add("For example:")
-        help.add(Utils.helpFormat("%c $CRYPTO_CMD BTC"))
-        help.add(Utils.helpFormat("%c $CRYPTO_CMD ETH EUR"))
-        help.add(Utils.helpFormat("%c $CRYPTO_CMD ETH2 GPB"))
+        help.add(helpFormat("%c $CRYPTO_CMD BTC"))
+        help.add(helpFormat("%c $CRYPTO_CMD ETH EUR"))
+        help.add(helpFormat("%c $CRYPTO_CMD ETH2 GPB"))
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 53c39ad..8d1afc3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -32,7 +32,8 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import kotlin.random.Random
 
 /**
@@ -52,13 +53,13 @@ class Dice(bot: Mobibot) : AbstractModule(bot) {
         with(bot) {
             send(
                 channel,
-                "$sender rolled two dice: ${Utils.bold(playerRoll.first)} and ${Utils.bold(playerRoll.second)}"
-                    + " for a total of ${Utils.bold(playerTotal)}",
+                "$sender rolled two dice: ${bold(playerRoll.first)} and ${bold(playerRoll.second)}"
+                    + " for a total of ${bold(playerTotal)}",
                 isPrivate
             )
             action(
-                "rolled two dice: ${Utils.bold(roll.first)} and ${Utils.bold(roll.second)}" +
-                    " for a total of ${Utils.bold(total)}"
+                "rolled two dice: ${bold(roll.first)} and ${bold(roll.second)}" +
+                    " for a total of ${bold(total)}"
             )
             when (winLoseOrTie(total, playerTotal)) {
                 Result.WIN -> action("wins.")
@@ -99,6 +100,6 @@ class Dice(bot: Mobibot) : AbstractModule(bot) {
     init {
         commands.add(DICE_CMD)
         help.add("To roll the dice:")
-        help.add(Utils.helpFormat("%c $DICE_CMD"))
+        help.add(helpFormat("%c $DICE_CMD"))
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
index 6ead8e7..8c50d09 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -33,7 +33,7 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import org.apache.commons.net.whois.WhoisClient
 import java.io.IOException
 import java.net.InetAddress
@@ -164,6 +164,6 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
     init {
         commands.add(LOOKUP_CMD)
         help.add("To perform a DNS lookup query:")
-        help.add(Utils.helpFormat("%c $LOOKUP_CMD <ip address or hostname>"))
+        help.add(helpFormat("%c $LOOKUP_CMD <ip address or hostname>"))
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
index 3e77d96..c970aca 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -31,7 +31,7 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.obfuscate
 import org.apache.commons.lang3.StringUtils
 
 /**
@@ -68,7 +68,7 @@ class ModuleException : Exception {
      * Return the sanitized message (e.g. remove API keys, etc.)
      */
     fun getSanitizedMessage(vararg sanitize: String): String {
-        val obfuscate = sanitize.map { Utils.obfuscate(it) }.toTypedArray()
+        val obfuscate = sanitize.map { obfuscate(it) }.toTypedArray()
         return when {
             cause != null -> {
                 cause.javaClass.name + ": " + StringUtils.replaceEach(cause.message, sanitize, obfuscate)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
index ecfdf47..0a97d7b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import kotlin.random.Random
 
 /**
@@ -85,6 +85,6 @@ class Ping(bot: Mobibot) : AbstractModule(bot) {
     init {
         commands.add(PING_CMD)
         help.add("To ping the bot:")
-        help.add(Utils.helpFormat("%c $PING_CMD"))
+        help.add(helpFormat("%c $PING_CMD"))
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
index 7fdefd4..eb08dd5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -34,7 +34,7 @@ package net.thauvin.erik.mobibot.modules
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.TwitterTimer
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.commands.links.LinksMgr
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.msg.Message
@@ -235,7 +235,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(TWITTER_CMD)
         help.add("To post to Twitter:")
-        help.add(Utils.helpFormat("%c $TWITTER_CMD <message>"))
+        help.add(helpFormat("%c $TWITTER_CMD <message>"))
         properties[AUTOPOST_PROP] = "false"
         initProperties(CONSUMER_KEY_PROP, CONSUMER_SECRET_PROP, HANDLE_PROP, TOKEN_PROP, TOKEN_SECRET_PROP)
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 0b21462..0d74165 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -32,7 +32,8 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.PublicMessage
@@ -76,16 +77,16 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             val tz = COUNTRIES_MAP[(query.substring(query.indexOf(' ') + 1).trim()).uppercase()]
             val response: String = if (tz != null) {
                 if (BEATS_KEYWORD == tz) {
-                    "The current Internet Time is: " + Utils.bold(internetTime() + ' ' + BEATS_KEYWORD)
+                    "The current Internet Time is: " + bold(internetTime() + ' ' + BEATS_KEYWORD)
                 } else {
                     (ZonedDateTime.now()
                         .withZoneSameInstant(ZoneId.of(tz))
                         .format(
                             DateTimeFormatter.ofPattern(
-                                "'The time is ${Utils.bold("'HH:mm'")} on ${Utils.bold("'EEEE, d MMMM yyyy'")} in '"
+                                "'The time is ${bold("'HH:mm'")} on ${bold("'EEEE, d MMMM yyyy'")} in '"
                             )
                         )
-                        + Utils.bold(tz.substring(tz.indexOf('/') + 1).replace('_', ' '))
+                        + bold(tz.substring(tz.indexOf('/') + 1).replace('_', ' '))
                         )
                 }
             } else {
@@ -214,9 +215,9 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
 
     init {
         help.add("To display a country's current date/time:")
-        help.add(Utils.helpFormat("%c $TIME_CMD") + " [<country code>]")
+        help.add(helpFormat("%c $TIME_CMD") + " [<country code>]")
         help.add("For a listing of the supported countries:")
-        help.add(Utils.helpFormat("%c $TIME_CMD"))
+        help.add(helpFormat("%c $TIME_CMD"))
         commands.add(TIME_CMD)
     }
 }
diff --git a/version.properties b/version.properties
index be3f7f2..596efc1 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 11 01:30:42 PDT 2021
-version.buildmeta=726
+#Tue May 11 12:39:39 PDT 2021
+version.buildmeta=727
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+726
+version.semver=0.8.0-beta+727

From ad3a9907a3eb7609736c860dd4838e6b2ca64203 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 11 May 2021 13:30:58 -0700
Subject: [PATCH 154/262] Converted versions command to Kotlin.

---
 .../erik/mobibot/commands/Versions.java       | 95 -------------------
 .../thauvin/erik/mobibot/commands/Versions.kt | 65 +++++++++++++
 version.properties                            |  6 +-
 3 files changed, 68 insertions(+), 98 deletions(-)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
 create mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java b/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
deleted file mode 100644
index a86493f..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Versions.java
- *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands;
-
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.ReleaseInfo;
-import net.thauvin.erik.mobibot.Utils;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.List;
-
-public class Versions extends AbstractCommand {
-    private final List<String> allVersions =
-            List.of("Version:  " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
-                    "Platform: " + System.getProperty("os.name") + ' ' + System.getProperty("os.version")
-                    + " (" + System.getProperty("os.arch") + ')',
-                    "Runtime:  " + System.getProperty("java.runtime.name")
-                    + ' ' + System.getProperty("java.runtime.version"));
-
-    public Versions(@NotNull final Mobibot bot) {
-        super(bot);
-    }
-
-    @NotNull
-    @Override
-    public String getName() {
-        return "versions";
-    }
-
-
-    @NotNull
-    @Override
-    public List<String> getHelp() {
-        return List.of("To view the versions data (bot, platform, java, etc.):", Utils.helpFormat("%c " + getName()));
-    }
-
-    @Override
-    public boolean isOp() {
-        return true;
-    }
-
-    @Override
-    public boolean isPublic() {
-        return false;
-    }
-
-    @Override
-    public boolean isVisible() {
-        return true;
-    }
-
-    @Override
-    public void commandResponse(@NotNull final String sender,
-                                @NotNull final String login,
-                                @NotNull final String args,
-                                final boolean isOp,
-                                final boolean isPrivate) {
-        if (isOp) {
-            getBot().sendList(sender, allVersions, 1, isPrivate);
-        } else {
-            getBot().helpDefault(sender, false, isPrivate);
-        }
-
-    }
-}
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
new file mode 100644
index 0000000..57cd79b
--- /dev/null
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
@@ -0,0 +1,65 @@
+/*
+ * Versions.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.ReleaseInfo
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isoLocalDate
+
+class Versions(bot: Mobibot) : AbstractCommand(bot) {
+    private val allVersions = listOf(
+        "Version:  ${ReleaseInfo.VERSION} (" + isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
+        "Platform: " + System.getProperty("os.name") + ' ' + System.getProperty("os.version")
+            + " (" + System.getProperty("os.arch") + ')',
+        "Runtime:  " + System.getProperty("java.runtime.name") + ' ' + System.getProperty("java.runtime.version")
+    )
+    override val name = "versions"
+    override val help = listOf("To view the versions data (bot, platform, java, etc.):", helpFormat("%c $name"))
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = true
+
+    override fun commandResponse(
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.sendList(sender, allVersions, 1, isPrivate)
+        } else {
+            bot.helpDefault(sender, false, isPrivate)
+        }
+    }
+}
diff --git a/version.properties b/version.properties
index 596efc1..aeb3fb7 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 11 12:39:39 PDT 2021
-version.buildmeta=727
+#Tue May 11 13:27:24 PDT 2021
+version.buildmeta=728
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+727
+version.semver=0.8.0-beta+728

From b98879bd7d1cf08ea5ae4964da2539fd5effd362 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 11 May 2021 17:51:24 -0700
Subject: [PATCH 155/262] Converted info command to Kotlin.

---
 .../thauvin/erik/mobibot/commands/Info.java   | 109 ------------------
 .../net/thauvin/erik/mobibot/commands/Info.kt |  80 +++++++++++++
 2 files changed, 80 insertions(+), 109 deletions(-)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/commands/Info.java
 create mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt

diff --git a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java b/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
deleted file mode 100644
index 8597c8c..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/commands/Info.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Info.java
- *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands;
-
-import net.thauvin.erik.mobibot.Mobibot;
-import net.thauvin.erik.mobibot.ReleaseInfo;
-import net.thauvin.erik.mobibot.Utils;
-import net.thauvin.erik.mobibot.commands.links.LinksMgr;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.management.ManagementFactory;
-import java.util.List;
-
-public class Info extends AbstractCommand {
-    private final List<String> allVersions = List.of(
-            Utils.capitalize(ReleaseInfo.PROJECT) + " " + ReleaseInfo.VERSION
-            + " (" + Utils.green(ReleaseInfo.WEBSITE) + ')',
-            "Written by " + ReleaseInfo.AUTHOR + " (" + Utils.green(ReleaseInfo.AUTHOR_URL) + ')');
-
-    public Info(final Mobibot bot) {
-        super(bot);
-    }
-
-    @NotNull
-    @Override
-    public String getName() {
-        return "info";
-    }
-
-    @NotNull
-    @Override
-    public List<String> getHelp() {
-        return List.of("To view information about the bot:", Utils.helpFormat("%c " + getName()));
-    }
-
-    @Override
-    public boolean isOp() {
-        return false;
-    }
-
-    @Override
-    public boolean isPublic() {
-        return true;
-    }
-
-    @Override
-    public boolean isVisible() {
-        return true;
-    }
-
-    @Override
-    public void commandResponse(@NotNull final String sender,
-                                @NotNull final String login,
-                                @NotNull final String args,
-                                final boolean isOp,
-                                final boolean isPrivate) {
-        getBot().sendList(sender, allVersions, 1, isPrivate);
-
-        final StringBuilder info = new StringBuilder(29);
-
-        info.append("Uptime: ")
-            .append(Utils.uptime(ManagementFactory.getRuntimeMXBean().getUptime()))
-            .append(" [Entries: ")
-            .append(LinksMgr.entries.size());
-
-        if (isOp) {
-            if (getBot().getTell().isEnabled()) {
-                info.append(", Messages: ").append(getBot().getTell().size());
-            }
-            if (getBot().getTwitter().isAutoPost()) {
-                info.append(", Twitter: ").append(getBot().getTwitter().entriesCount());
-            }
-        }
-
-        info.append(", Recap: ").append(Recap.recaps.size()).append(']');
-
-        getBot().send(sender, info.toString(), isPrivate);
-    }
-}
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
new file mode 100644
index 0000000..d3df42e
--- /dev/null
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
@@ -0,0 +1,80 @@
+/*
+ * Info.java
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.ReleaseInfo
+import net.thauvin.erik.mobibot.Utils.capitalize
+import net.thauvin.erik.mobibot.Utils.green
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.uptime
+import net.thauvin.erik.mobibot.commands.links.LinksMgr
+import java.lang.management.ManagementFactory
+
+class Info(bot: Mobibot?) : AbstractCommand(bot!!) {
+    private val allVersions = listOf(
+        capitalize(ReleaseInfo.PROJECT) + " ${ReleaseInfo.VERSION} (" + green(ReleaseInfo.WEBSITE) + ')',
+        "Written by ${ReleaseInfo.AUTHOR} (" + green(ReleaseInfo.AUTHOR_URL) + ')'
+    )
+    override val name = "info"
+    override val help = listOf("To view information about the bot:", helpFormat("%c $name"))
+    override val isOp = false
+    override val isPublic = true
+    override val isVisible = true
+
+    override fun commandResponse(
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        with(bot) {
+            sendList(sender, allVersions, 1, isPrivate)
+            val info = StringBuilder()
+            info.append("Uptime: ")
+                .append(uptime(ManagementFactory.getRuntimeMXBean().uptime))
+                .append(" [Entries: ")
+                .append(LinksMgr.entries.size)
+            if (isOp) {
+                if (tell.isEnabled()) {
+                    info.append(", Messages: ").append(tell.size())
+                }
+                if (twitter.isAutoPost) {
+                    info.append(", Twitter: ").append(twitter.entriesCount())
+                }
+            }
+            info.append(", Recap: ").append(Recap.recaps.size).append(']')
+            send(sender, info.toString(), isPrivate)
+        }
+    }
+}

From 0d3dc268ca99ecf839f3be410e27447f9c5e7baf Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 11 May 2021 17:51:52 -0700
Subject: [PATCH 156/262] Fixed Google search test, again.

---
 .../net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt    | 2 +-
 version.properties                                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index fd34802..f2fec0b 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -49,7 +49,7 @@ class GoogleSearchTest : LocalProperties() {
         try {
             var messages = searchGoogle("mobitopia", apiKey, cseKey)
             assertThat(messages).describedAs("mobitopia results not empty").isNotEmpty
-            assertThat(messages[0].msg).describedAs("found freenode").contains("freenode")
+            assertThat(messages[0].msg).describedAs("found mobibtopia").contains("mobitopia")
             messages = searchGoogle("aapl", apiKey, cseKey)
             assertThat(messages).describedAs("aapl results not empty").isNotEmpty
             assertThat(messages[0].msg).describedAs("found apple").containsIgnoringCase("apple")
diff --git a/version.properties b/version.properties
index aeb3fb7..bec7ede 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 11 13:27:24 PDT 2021
-version.buildmeta=728
+#Tue May 11 17:49:06 PDT 2021
+version.buildmeta=730
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+728
+version.semver=0.8.0-beta+730

From 694cc119edbb458423fb905df2d712e956af5dd6 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 12 May 2021 19:03:14 -0700
Subject: [PATCH 157/262] Removed spotbugs.

---
 build.gradle                                  | 28 ++-----------
 config/spotbugs/excludeFilter.xml             | 40 -------------------
 .../thauvin/erik/mobibot/TwitterOAuth.java    |  4 +-
 .../net/thauvin/erik/mobibot/modules/War.java | 15 ++++---
 version.properties                            |  6 +--
 5 files changed, 14 insertions(+), 79 deletions(-)
 delete mode 100644 config/spotbugs/excludeFilter.xml

diff --git a/build.gradle b/build.gradle
index d5efd48..5fe6323 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,6 @@ plugins {
     id 'application'
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.38.0'
-    id 'com.github.spotbugs' version '4.7.1'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.17.0-RC1'
     id 'jacoco'
@@ -23,7 +22,6 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 ext.versions = [
     log4j   : '2.14.1',
     pmd     : '6.34.0',
-    spotbugs: '4.2.3'
 ]
 
 repositories {
@@ -61,19 +59,14 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
-    compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
-    testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
-
     testImplementation 'org.assertj:assertj-core:3.19.0'
     testImplementation 'org.testng:testng:7.4.0'
-
-    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'
-    spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
 }
 
 test {
     testLogging {
         exceptionFormat "full"
+        events /* "passed", */ "skipped", "failed"
     }
     useTestNG() {
         options.suites('src/test/resources/testng.xml')
@@ -106,22 +99,7 @@ compileJava {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        jvmTarget = '11'
-    }
-}
-
-spotbugs {
-    toolVersion.set("$versions.spotbugs")
-    excludeFilter.set(file("$projectDir/config/spotbugs/excludeFilter.xml"))
-    tasks.spotbugsMain {
-        reports.create("html") {
-            enabled = true
-        }
-    }
-    tasks.spotbugsTest {
-        reports.create("html") {
-            enabled = true
-        }
+        jvmTarget = java.targetCompatibility.toString()
     }
 }
 
@@ -213,7 +191,7 @@ task copyToDeployLib(type: Copy) {
 }
 
 task deploy(dependsOn: ['clean', 'build', 'jar']) {
-    description = 'Copies all needed files to the ${deployDir} directory.'
+    description = "Copies all needed files to the ${deployDir} directory."
     group = 'Publishing'
     outputs.dir deployDir
     inputs.files copyToDeploy
diff --git a/config/spotbugs/excludeFilter.xml b/config/spotbugs/excludeFilter.xml
deleted file mode 100644
index 21512f0..0000000
--- a/config/spotbugs/excludeFilter.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<FindBugsFilter
-        xmlns="https://github.com/spotbugs/filter/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/4.0.0/spotbugs/etc/findbugsfilter.xsd">
-    <Match>
-        <Or>
-            <Package name="net.thauvin.erik.mobibot.*"/>
-            <Package name="net.thauvin.erik.mobibot.commands.tell.*"/>
-            <Package name="net.thauvin.erik.mobibot.entries.*"/>
-        </Or>
-        <Or>
-            <Bug pattern="PATH_TRAVERSAL_IN"/>
-            <Bug pattern="PATH_TRAVERSAL_OUT"/>
-
-        </Or>
-        <Confidence value="2"/>
-    </Match>
-    <Match>
-        <Or>
-            <Class name="net.thauvin.erik.mobibot.Mobibot"/>
-            <Class name="net.thauvin.erik.mobibot.Pinboard"/>
-            <Class name="net.thauvin.erik.mobibot.FeedReader"/>
-            <Class name="net.thauvin.erik.mobibot.commands.tell.Tell"/>
-            <Class name="net.thauvin.erik.mobibot.commands.Versions"/>
-            <Package name="net.thauvin.erik.mobibot.modules.*"/>
-            <Package name="net.thauvin.erik.mobibot.entries.*"/>
-        </Or>
-        <Bug pattern="FCCD_FIND_CLASS_CIRCULAR_DEPENDENCY"/>
-    </Match>
-    <Match>
-        <Class name="net.thauvin.erik.mobibot.Mobibot"/>
-        <Method name="main"/>
-        <Bug pattern="PATH_TRAVERSAL_OUT"/>
-        <Confidence value="1"/>
-    </Match>
-    <Match>
-        <Source name="~.*\.kt"/>
-    </Match>
-</FindBugsFilter>
diff --git a/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java b/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
index 8396fce..2690710 100644
--- a/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
+++ b/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
@@ -32,7 +32,6 @@
 
 package net.thauvin.erik.mobibot;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import twitter4j.TwitterException;
 import twitter4j.TwitterFactory;
 import twitter4j.auth.AccessToken;
@@ -69,8 +68,7 @@ public final class TwitterOAuth {
      * @throws TwitterException If an error occurs.
      * @throws IOException      If an IO error occurs.
      */
-    @SuppressFBWarnings({ "DM_DEFAULT_ENCODING", "IMC_IMMATURE_CLASS_PRINTSTACKTRACE" })
-    @SuppressWarnings({ "PMD.AvoidPrintStackTrace", "PMD.SystemPrintln" })
+    @SuppressWarnings({ "PMD.SystemPrintln" })
     public static void main(final String[] args) throws TwitterException, IOException {
         if (args.length == 2) {
             final twitter4j.Twitter twitter = new TwitterFactory().getInstance();
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index af9e1d4..8c18b9f 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -32,7 +32,6 @@
 
 package net.thauvin.erik.mobibot.modules;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
 import org.jetbrains.annotations.NotNull;
@@ -56,6 +55,8 @@ public final class War extends AbstractModule {
             new String[]{ "Ace", "King", "Queen", "Jack", "10", "9", "8", "7", "6", "5", "4", "3", "2" };
     // Suits for the deck of card
     private static final String[] WAR_SUITS = new String[]{ "Hearts", "Spades", "Diamonds", "Clubs" };
+    // Random
+    private static final SecureRandom RANDOM = new SecureRandom();
 
     /**
      * The default constructor.
@@ -72,24 +73,22 @@ public final class War extends AbstractModule {
     /**
      * {@inheritDoc}
      */
-    @SuppressFBWarnings("DMI_RANDOM_USED_ONLY_ONCE")
     @Override
     public void commandResponse(@NotNull final String sender,
                                 @NotNull final String cmd,
                                 @NotNull final String args,
                                 final boolean isPrivate) {
-        final SecureRandom r = new SecureRandom();
-
         int i;
         int y;
 
         while (true) {
-            i = r.nextInt(WAR_DECK.length);
-            y = r.nextInt(WAR_DECK.length);
+            i = RANDOM.nextInt(WAR_DECK.length);
+            y = RANDOM.nextInt(WAR_DECK.length);
 
             getBot().send(sender + " drew the " + bold(WAR_DECK[i]) + " of "
-                          + bold(WAR_SUITS[r.nextInt(WAR_SUITS.length)]));
-            getBot().action("drew the " + bold(WAR_DECK[y]) + " of " + bold(WAR_SUITS[r.nextInt(WAR_SUITS.length)]));
+                          + bold(WAR_SUITS[RANDOM.nextInt(WAR_SUITS.length)]));
+            getBot().action("drew the " + bold(WAR_DECK[y]) + " of "
+                            + bold(WAR_SUITS[RANDOM.nextInt(WAR_SUITS.length)]));
 
             if (i != y) {
                 break;
diff --git a/version.properties b/version.properties
index bec7ede..7802055 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 11 17:49:06 PDT 2021
-version.buildmeta=730
+#Wed May 12 19:01:23 PDT 2021
+version.buildmeta=751
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+730
+version.semver=0.8.0-beta+751

From 11a75a7179bc05fb763959bb7ef25579a6e630f8 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 13 May 2021 18:38:09 -0700
Subject: [PATCH 158/262] Moved TwitterOAuth to Kotlin.

---
 .../thauvin/erik/mobibot/TwitterOAuth.java    | 111 -----------------
 .../net/thauvin/erik/mobibot/TwitterOAuth.kt  | 113 ++++++++++++++++++
 2 files changed, 113 insertions(+), 111 deletions(-)
 delete mode 100644 src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
 create mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt

diff --git a/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java b/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
deleted file mode 100644
index 2690710..0000000
--- a/src/main/java/net/thauvin/erik/mobibot/TwitterOAuth.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * TwitterOAuth.java
- *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot;
-
-import twitter4j.TwitterException;
-import twitter4j.TwitterFactory;
-import twitter4j.auth.AccessToken;
-import twitter4j.auth.RequestToken;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-/**
- * The <code>TwitterOAuth</code> class.
- * <p>
- * Go to <a href="http://twitter.com/oauth_clients/new">http://twitter.com/oauth_clients/new</a> to register your bot.
- * </p>
- * Then execute:
- * <p>
- * <code>
- * java -cp "mobibot.jar:lib/*" net.thauvin.erik.mobibot.TwitterOAuth &lt;consumerKey&gt; &lt;consumerSecret&gt;
- * </code>
- * </p>
- * and follow the prompts/instructions.
- *
- * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @author <a href="http://twitter4j.org/en/code-examples.html#oauth" target="_blank">Twitter4J</a>
- * @created Sep 13, 2010
- * @since 1.0
- */
-@SuppressWarnings("PMD.UseUtilityClass")
-public final class TwitterOAuth {
-    /**
-     * Twitter OAuth Client Registration.
-     *
-     * @param args The consumerKey and consumerSecret should be passed as arguments.
-     * @throws TwitterException If an error occurs.
-     * @throws IOException      If an IO error occurs.
-     */
-    @SuppressWarnings({ "PMD.SystemPrintln" })
-    public static void main(final String[] args) throws TwitterException, IOException {
-        if (args.length == 2) {
-            final twitter4j.Twitter twitter = new TwitterFactory().getInstance();
-            twitter.setOAuthConsumer(args[0], args[1]);
-            final RequestToken requestToken = twitter.getOAuthRequestToken();
-            AccessToken accessToken = null;
-            try (final BufferedReader br = new BufferedReader(new InputStreamReader(System.in))) {
-                while (null == accessToken) {
-                    System.out.println("Open the following URL and grant access to your account:");
-                    System.out.println(requestToken.getAuthorizationURL());
-                    System.out.print("Enter the PIN (if available) or just hit enter.[PIN]:");
-                    final String pin = br.readLine();
-                    try {
-                        if (pin != null && pin.length() > 0) {
-                            accessToken = twitter.getOAuthAccessToken(requestToken, pin);
-                        } else {
-                            accessToken = twitter.getOAuthAccessToken();
-                        }
-
-                        System.out.println(
-                                "Please add the following to the bot's property file:" + "\n\n" + "twitter-consumerKey="
-                                + args[0] + '\n' + "twitter-consumerSecret=" + args[1] + '\n' + "twitter-token="
-                                + accessToken.getToken() + '\n' + "twitter-tokenSecret=" + accessToken
-                                                                                                   .getTokenSecret());
-                    } catch (TwitterException te) {
-                        if (401 == te.getStatusCode()) {
-                            System.out.println("Unable to get the access token.");
-                        } else {
-                            te.printStackTrace();
-                        }
-                    }
-                }
-            }
-        } else {
-            System.out.println("Usage: " + TwitterOAuth.class.getName() + " <consumerKey> <consumerSecret>");
-        }
-
-        System.exit(0);
-    }
-}
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
new file mode 100644
index 0000000..31bde39
--- /dev/null
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
@@ -0,0 +1,113 @@
+/*
+ * TwitterOAuth.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot
+
+import twitter4j.TwitterException
+import twitter4j.TwitterFactory
+import twitter4j.auth.AccessToken
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
+import kotlin.system.exitProcess
+
+/**
+ * The `TwitterOAuth` class.
+ *
+ * Go to [https://developer.twitter.com/en/apps](https://developer.twitter.com/en/apps) to register your bot.
+ *
+ * Then execute:
+ *
+ * `java -cp mobibot.jar net.thauvin.erik.mobibot.TwitterOAuth <consumerKey> <consumerSecret>`
+ *
+ * and follow the prompts/instructions.
+ *
+ * @author [Erik C. Thauvin](https://erik.thauvin.net)
+ * @author [Twitter4J Example](https://twitter4j.org/en/code-examples.html#oauth)
+ */
+object TwitterOAuth {
+    /**
+     * Twitter OAuth Client Registration.
+     *
+     * @param args The consumerKey and consumerSecret should be passed as arguments.
+     */
+    @Throws(TwitterException::class, IOException::class)
+    @JvmStatic
+    fun main(args: Array<String>) {
+        if (args.size == 2) {
+            with(TwitterFactory.getSingleton()) {
+                setOAuthConsumer(args[0], args[1])
+                val requestToken = oAuthRequestToken
+                var accessToken: AccessToken? = null
+                BufferedReader(InputStreamReader(System.`in`)).use { br ->
+                    while (null == accessToken) {
+                        print(
+                            """
+                            Open the following URL and grant access to your account:
+                        
+                            ${requestToken.authorizationURL}
+
+                            Enter the PIN (if available) or just hit enter. [PIN]: """.trimIndent()
+                        )
+                        val pin = br.readLine()
+                        try {
+                            accessToken = if (!pin.isNullOrEmpty()) {
+                                getOAuthAccessToken(requestToken, pin)
+                            } else {
+                                oAuthAccessToken
+                            }
+                            println(
+                                """
+                                Please add the following to the bot's property file:
+                                
+                                twitter-consumerKey=${args[0]}
+                                twitter-consumerSecret=${args[1]}
+                                twitter-token=${accessToken?.token}
+                                twitter-tokenSecret=${accessToken?.tokenSecret}
+                                """.trimIndent()
+                            )
+                        } catch (te: TwitterException) {
+                            @Suppress("MagicNumber")
+                            if (401 == te.statusCode) {
+                                println("Unable to get the access token.")
+                            } else {
+                                te.printStackTrace()
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            println("Usage: ${TwitterOAuth::class.java.name} <consumerKey> <consumerSecret>")
+        }
+        exitProcess(0)
+    }
+}

From 790bd3159e9e9d3c88f94fecef9d4e1b4be3a6dc Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 13 May 2021 21:37:16 -0700
Subject: [PATCH 159/262] Cleanup.

---
 .idea/codeStyles/Project.xml                  |  3 +
 .idea/codeStyles/codeStyleConfig.xml          |  1 -
 build.gradle                                  |  6 --
 config/detekt/baseline.xml                    |  1 +
 properties/mobibot.properties                 |  2 +-
 .../net/thauvin/erik/mobibot/modules/War.java |  4 +-
 .../kotlin/net/thauvin/erik/mobibot/Addons.kt |  6 +-
 .../net/thauvin/erik/mobibot/Constants.kt     |  2 +-
 .../net/thauvin/erik/mobibot/Mobibot.kt       | 10 ++--
 .../net/thauvin/erik/mobibot/PinboardUtils.kt |  3 +-
 .../net/thauvin/erik/mobibot/TwitterTimer.kt  |  2 +-
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  |  6 +-
 .../erik/mobibot/commands/tell/Tell.kt        |  2 +-
 .../erik/mobibot/entries/EntriesMgr.kt        |  2 +-
 .../thauvin/erik/mobibot/entries/EntryLink.kt |  3 +-
 .../net/thauvin/erik/mobibot/modules/Calc.kt  |  4 +-
 .../erik/mobibot/modules/StockQuote.kt        | 59 ++++++++++---------
 .../thauvin/erik/mobibot/modules/Twitter.kt   |  1 -
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  3 +-
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  6 +-
 .../thauvin/erik/mobibot/LocalProperties.kt   |  2 +-
 .../net/thauvin/erik/mobibot/UtilsTest.kt     |  2 +-
 version.properties                            |  6 +-
 23 files changed, 67 insertions(+), 69 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6407ef6..321b376 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -14,6 +14,9 @@
       <option name="JD_INDENT_ON_CONTINUATION" value="true" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 23f4bb5..79ee123 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Erik's Code Style" />
   </state>
 </component>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5fe6323..871deaa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -116,12 +116,6 @@ detekt {
     baseline = file("${projectDir}/config/detekt/baseline.xml")
 }
 
-javadoc {
-    options.tags = ['created']
-    options.author = true
-    options.links('http://www.jibble.org/javadocs/pircbot/', 'http://docs.oracle.com/javase/8/docs/api/')
-}
-
 jar {
     manifest.attributes('Main-Class': mainClassName,
             'Class-Path': '. ./lib/' + configurations.runtimeClasspath.collect { it.getName() }.join(' ./lib/'))
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 81addac..07ee2ba 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -34,6 +34,7 @@
     <ID>NestedBlockDepth:Tell.kt$Tell$ @JvmOverloads fun send(nickname: String, isMessage: Boolean = false)</ID>
     <ID>NestedBlockDepth:Tell.kt$Tell$// Delete message. private fun deleteMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ fun save(file: String, messages: List&lt;TellMessage?&gt;?, logger: Logger)</ID>
+    <ID>NestedBlockDepth:TwitterOAuth.kt$TwitterOAuth$ @Throws(TwitterException::class, IOException::class) @JvmStatic fun main(args: Array&lt;String&gt;)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
diff --git a/properties/mobibot.properties b/properties/mobibot.properties
index 4043eeb..8089d08 100644
--- a/properties/mobibot.properties
+++ b/properties/mobibot.properties
@@ -27,7 +27,7 @@ tell-max-size=50
 #pinboard-api-token=user\:TOKEN
 
 #
-# Configure app at: https://apps.twitter.com/
+# Configure app at: https://developer.twitter.com/en/apps
 # and then: java -cp mobibot.jar net.thauvin.erik.mobibot.TwitterOAuth <consumerKey> <consumerSecret>
 #
 #twitter-consumerKey=
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 8c18b9f..7795e33 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -48,6 +48,8 @@ import static net.thauvin.erik.mobibot.Utils.bold;
  * @since 1.0
  */
 public final class War extends AbstractModule {
+    // Random
+    private static final SecureRandom RANDOM = new SecureRandom();
     // War command
     private static final String WAR_CMD = "war";
     // Deck of card
@@ -55,8 +57,6 @@ public final class War extends AbstractModule {
             new String[]{ "Ace", "King", "Queen", "Jack", "10", "9", "8", "7", "6", "5", "4", "3", "2" };
     // Suits for the deck of card
     private static final String[] WAR_SUITS = new String[]{ "Hearts", "Spades", "Diamonds", "Clubs" };
-    // Random
-    private static final SecureRandom RANDOM = new SecureRandom();
 
     /**
      * The default constructor.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
index c2151a0..5496fd9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
@@ -33,7 +33,7 @@ package net.thauvin.erik.mobibot
 
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.modules.AbstractModule
-import java.util.*
+import java.util.Properties
 
 /**
  * Modules and Commands addons.
@@ -100,8 +100,8 @@ class Addons {
         val mods = if (isPrivate) modules.filter { it.isPrivateMsgEnabled } else modules
         for (module in mods) {
             if (module.commands.contains(cmd)) {
-                    module.commandResponse(sender, cmd, args, isPrivate)
-                    return true
+                module.commandResponse(sender, cmd, args, isPrivate)
+                return true
             }
         }
         return false
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
index 317cc35..d1b33b3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
@@ -31,7 +31,7 @@
  */
 package net.thauvin.erik.mobibot
 
-import java.util.*
+import java.util.Locale
 
 /**
  * The `Constants`.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 1efd54b..90997bc 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -64,8 +64,8 @@ import net.thauvin.erik.mobibot.commands.links.View
 import net.thauvin.erik.mobibot.commands.tell.Tell
 import net.thauvin.erik.mobibot.entries.EntriesMgr
 import net.thauvin.erik.mobibot.entries.EntryLink
-import net.thauvin.erik.mobibot.modules.CryptoPrices
 import net.thauvin.erik.mobibot.modules.Calc
+import net.thauvin.erik.mobibot.modules.CryptoPrices
 import net.thauvin.erik.mobibot.modules.CurrencyConverter
 import net.thauvin.erik.mobibot.modules.Dice
 import net.thauvin.erik.mobibot.modules.GoogleSearch
@@ -99,7 +99,8 @@ import java.io.IOException
 import java.io.PrintStream
 import java.nio.file.Files
 import java.nio.file.Paths
-import java.util.*
+import java.util.Properties
+import java.util.Timer
 import java.util.logging.ConsoleHandler
 import java.util.regex.Pattern
 import kotlin.system.exitProcess
@@ -358,7 +359,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
             helpResponse(sender, args, true)
         } else if (isOp && Constants.KILL_CMD == cmd) { // kill
             twitter.notification("$name killed by $sender on $channel")
-            sendRawLine("QUIT : Poof!")
+            sendRawLine("QUIT :Poof!")
             exitProcess(0)
         } else if (isOp && Constants.DIE_CMD == cmd) { // die
             send("$sender has just signed my death sentence.")
@@ -492,8 +493,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      * Returns the bot's version.
      */
     override fun onVersion(sourceNick: String, sourceLogin: String, sourceHostname: String, target: String) {
-        sendRawLine("NOTICE " + sourceNick + " :\u0001VERSION " + ReleaseInfo.PROJECT + ' ' + ReleaseInfo.VERSION
-                    + "\u0001")
+        sendRawLine("NOTICE $sourceNick :\u0001VERSION ${ReleaseInfo.PROJECT} ${ReleaseInfo.VERSION}\u0001")
     }
 
     companion object {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
index 29460ed..8c388f9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -32,7 +32,6 @@
 
 package net.thauvin.erik.mobibot
 
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.runBlocking
 import net.thauvin.erik.mobibot.entries.EntryLink
@@ -40,7 +39,7 @@ import net.thauvin.erik.pinboard.PinboardPoster
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
-import java.util.*
+import java.util.Date
 
 /**
  * Handles posts to pinboard.in.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
index 0b8ad2a..6b3a4b3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
@@ -32,7 +32,7 @@
 
 package net.thauvin.erik.mobibot
 
-import java.util.*
+import java.util.TimerTask
 
 class TwitterTimer(var bot: Mobibot, private var index: Int) : TimerTask() {
     override fun run() {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 2304bc0..82ce058 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -44,7 +44,7 @@ import java.nio.charset.StandardCharsets
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.util.*
+import java.util.Date
 import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
 
@@ -82,13 +82,13 @@ object Utils {
         val replace = arrayOf(if (isPrivate) "/msg $botNick" else "$botNick:", botNick)
         return StringUtils.replaceEach(text, searchFlags, replace)
     }
-    
+
     /**
      * Capitalize a string.
      */
     @JvmStatic
     fun capitalize(s: String?): String? = s?.replaceFirstChar { it.uppercase() }
-    
+
     /**
      * Colorize a string.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index 80b7f79..9052110 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -327,7 +327,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
         const val MAX_DAYS_PROP = "tell-max-days"
 
         /**
-         * Max size proeprty.
+         * Max size property.
          */
         const val MAX_SIZE_PROP = "tell-max-size"
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index 00fe777..50a8e6a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -47,7 +47,7 @@ import java.io.OutputStreamWriter
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Paths
-import java.util.*
+import java.util.Calendar
 
 /**
  * Manages the feed entries.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
index 08d10e7..09f22a7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -36,7 +36,8 @@ import com.rometools.rome.feed.synd.SyndCategoryImpl
 import net.thauvin.erik.mobibot.commands.links.LinksMgr
 import org.apache.commons.lang3.StringUtils
 import java.io.Serializable
-import java.util.*
+import java.util.Calendar
+import java.util.Date
 
 /**
  * The class used to store link entries.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
index a197391..11602e6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -52,10 +52,10 @@ class Calc(bot: Mobibot) : AbstractModule(bot) {
             try {
                 bot.send(calculate(args))
             } catch (e: IllegalArgumentException) {
-                if (bot.logger.isWarnEnabled) bot.logger.warn("Failed to calcualte: $args", e)
+                if (bot.logger.isWarnEnabled) bot.logger.warn("Failed to calculate: $args", e)
                 bot.send("No idea. This is the kind of math I don't get.")
             } catch (e: UnknownFunctionOrVariableException) {
-                if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to calcualte: $args", e)
+                if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to calculate: $args", e)
                 bot.send("No idea. I must've some form of Dyscalculia.")
             }
         } else {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index f8e1a8f..60c5f0f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -79,7 +79,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
         const val INVALID_SYMBOL = "Invalid symbol."
 
         // Alpha Advantage URL
-        private const val ALAPHAVANTAGE_URL = "https://www.alphavantage.co/query?function="
+        private const val ALPHAVANTAGE_URL = "https://www.alphavantage.co/query?function="
 
         // Quote command
         private const val STOCK_CMD = "stock"
@@ -122,7 +122,8 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
         fun getQuote(symbol: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
                 throw ModuleException(
-                    "${Utils.capitalize(STOCK_CMD)} is disabled. The API key is missing.")
+                    "${Utils.capitalize(STOCK_CMD)} is disabled. The API key is missing."
+                )
             }
             return if (symbol.isNotBlank()) {
                 val debugMessage = "getQuote($symbol)"
@@ -132,10 +133,10 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                     with(messages) {
                         // Search for symbol/keywords
                         response = Utils.urlReader(
-                                URL(
-                                        "${ALAPHAVANTAGE_URL}SYMBOL_SEARCH&keywords=" + Utils.encodeUrl(symbol)
-                                            + "&apikey=" + Utils.encodeUrl(apiKey)
-                                )
+                            URL(
+                                "${ALPHAVANTAGE_URL}SYMBOL_SEARCH&keywords=" + Utils.encodeUrl(symbol)
+                                    + "&apikey=" + Utils.encodeUrl(apiKey)
+                            )
                         )
                         var json = getJsonResponse(response, debugMessage)
                         val symbols = json.getJSONArray("bestMatches")
@@ -146,11 +147,11 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
 
                             // Get quote for symbol
                             response = Utils.urlReader(
-                                    URL(
-                                            "${ALAPHAVANTAGE_URL}GLOBAL_QUOTE&symbol="
-                                                    + Utils.encodeUrl(symbolInfo.getString("1. symbol"))
-                                                    + "&apikey=" + Utils.encodeUrl(apiKey)
-                                    )
+                                URL(
+                                    "${ALPHAVANTAGE_URL}GLOBAL_QUOTE&symbol="
+                                        + Utils.encodeUrl(symbolInfo.getString("1. symbol"))
+                                        + "&apikey=" + Utils.encodeUrl(apiKey)
+                                )
                             )
                             json = getJsonResponse(response, debugMessage)
                             val quote = json.getJSONObject("Global Quote")
@@ -159,36 +160,36 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                                 return messages
                             }
                             add(
-                                    PublicMessage(
-                                            "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol"))
-                                                    + " [" + Utils.unescapeXml(symbolInfo.getString("2. name")) + ']'
-                                    )
+                                PublicMessage(
+                                    "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol"))
+                                        + " [" + Utils.unescapeXml(symbolInfo.getString("2. name")) + ']'
+                                )
                             )
                             add(PublicMessage("    Price:     " + Utils.unescapeXml(quote.getString("05. price"))))
                             add(
-                                    PublicMessage(
-                                            "    Previous:  " + Utils.unescapeXml(quote.getString("08. previous close"))
-                                    )
+                                PublicMessage(
+                                    "    Previous:  " + Utils.unescapeXml(quote.getString("08. previous close"))
+                                )
                             )
                             add(NoticeMessage("    Open:      " + Utils.unescapeXml(quote.getString("02. open"))))
                             add(NoticeMessage("    High:      " + Utils.unescapeXml(quote.getString("03. high"))))
                             add(NoticeMessage("    Low:       " + Utils.unescapeXml(quote.getString("04. low"))))
                             add(
-                                    NoticeMessage(
-                                            "    Volume:    " + Utils.unescapeXml(quote.getString("06. volume"))
-                                    )
+                                NoticeMessage(
+                                    "    Volume:    " + Utils.unescapeXml(quote.getString("06. volume"))
+                                )
                             )
                             add(
-                                    NoticeMessage(
-                                            "    Latest:    "
-                                                    + Utils.unescapeXml(quote.getString("07. latest trading day"))
-                                    )
+                                NoticeMessage(
+                                    "    Latest:    "
+                                        + Utils.unescapeXml(quote.getString("07. latest trading day"))
+                                )
                             )
                             add(
-                                    NoticeMessage(
-                                            "    Change:    " + Utils.unescapeXml(quote.getString("09. change")) + " ["
-                                                    + Utils.unescapeXml(quote.getString("10. change percent")) + ']'
-                                    )
+                                NoticeMessage(
+                                    "    Change:    " + Utils.unescapeXml(quote.getString("09. change")) + " ["
+                                        + Utils.unescapeXml(quote.getString("10. change percent")) + ']'
+                                )
                             )
                         }
                     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
index eb08dd5..09441a4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -42,7 +42,6 @@ import net.thauvin.erik.mobibot.msg.NoticeMessage
 import twitter4j.TwitterException
 import twitter4j.TwitterFactory
 import twitter4j.conf.ConfigurationBuilder
-import java.util.*
 
 /**
  * The Twitter module.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index 8c01cff..ae49759 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -102,7 +102,8 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
         fun getWeather(query: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
                 throw ModuleException(
-                    "${Utils.capitalize(WEATHER_CMD)} is disabled. The API key is missing.")
+                    "${Utils.capitalize(WEATHER_CMD)} is disabled. The API key is missing."
+                )
             }
             val owm = OWM(apiKey)
             val messages = mutableListOf<Message>()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 0d74165..78c91ec 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -41,8 +41,8 @@ import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoField
-import java.util.*
-import kotlin.collections.ArrayList
+import java.util.Collections
+import java.util.Locale
 
 /**
  * The WorldTime module.
@@ -146,7 +146,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["MX"] = "America/Mexico_City"
             countries["NL"] = "Europe/Amsterdam"
             countries["NO"] = "Europe/Oslo"
-            countries["NP"] = "Asia/Katmandu"
+            countries["NP"] = "Asia/Kathmandu"
             countries["NZ"] = "Pacific/Auckland"
             countries["PDT"] = "America/Los_Angeles"
             countries["PH"] = "Asia/Manila"
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt b/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
index 0c7095e..70434a4 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
@@ -35,7 +35,7 @@ import org.testng.annotations.BeforeSuite
 import java.io.IOException
 import java.nio.file.Files
 import java.nio.file.Paths
-import java.util.*
+import java.util.Properties
 
 /**
  * Access to `local.properties`.
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index a57d591..8b75b72 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -56,7 +56,7 @@ import java.io.File
 import java.io.IOException
 import java.net.URL
 import java.time.LocalDateTime
-import java.util.*
+import java.util.Calendar
 
 /**
  * The `Utils Test` class.
diff --git a/version.properties b/version.properties
index 7802055..3846e61 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed May 12 19:01:23 PDT 2021
-version.buildmeta=751
+#Thu May 13 21:34:31 PDT 2021
+version.buildmeta=771
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+751
+version.semver=0.8.0-beta+771

From 2e1c6e77324bdb8b00501258fae0865e473ad289 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 14 May 2021 20:57:25 -0700
Subject: [PATCH 160/262] Utils functions improvements.

---
 .../net/thauvin/erik/mobibot/Mobibot.kt       |  10 +-
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  | 139 ++++++++----------
 .../erik/mobibot/commands/AbstractCommand.kt  |   4 +-
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  18 ++-
 .../net/thauvin/erik/mobibot/commands/Info.kt |   6 +-
 .../thauvin/erik/mobibot/commands/Recap.kt    |   7 +-
 .../thauvin/erik/mobibot/commands/Versions.kt |   4 +-
 .../erik/mobibot/commands/links/LinksMgr.kt   |  18 ++-
 .../erik/mobibot/commands/tell/Tell.kt        |  35 ++---
 .../erik/mobibot/entries/EntriesMgr.kt        |   4 +-
 .../erik/mobibot/modules/CurrencyConverter.kt |  17 ++-
 .../erik/mobibot/modules/GoogleSearch.kt      |  18 ++-
 .../net/thauvin/erik/mobibot/modules/Joke.kt  |  10 +-
 .../erik/mobibot/modules/ModuleException.kt   |   2 +-
 .../erik/mobibot/modules/RockPaperScissors.kt |  13 +-
 .../erik/mobibot/modules/StockQuote.kt        |  58 ++++----
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  17 ++-
 .../thauvin/erik/mobibot/modules/WorldTime.kt |   4 +-
 .../net/thauvin/erik/mobibot/UtilsTest.kt     |  44 +++---
 .../thauvin/erik/mobibot/modules/CalcTest.kt  |   8 +-
 .../erik/mobibot/modules/WordTimeTest.kt      |   4 +-
 version.properties                            |   6 +-
 22 files changed, 221 insertions(+), 225 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 90997bc..2bb5d56 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -36,11 +36,11 @@ import net.thauvin.erik.mobibot.PinboardUtils.deletePin
 import net.thauvin.erik.mobibot.PinboardUtils.updatePin
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.colorize
-import net.thauvin.erik.mobibot.Utils.ensureDir
 import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.Utils.isoLocalDate
 import net.thauvin.erik.mobibot.Utils.today
+import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
+import net.thauvin.erik.mobibot.Utils.toDir
 import net.thauvin.erik.mobibot.commands.AddLog
 import net.thauvin.erik.mobibot.commands.ChannelFeed
 import net.thauvin.erik.mobibot.commands.Cycle
@@ -546,7 +546,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                 }
                 commandLine.hasOption(Constants.VERSION_ARG[0]) -> {
                     // Output the version
-                    println("${ReleaseInfo.PROJECT} ${ReleaseInfo.VERSION} (${isoLocalDate(ReleaseInfo.BUILDDATE)})")
+                    println("${ReleaseInfo.PROJECT} ${ReleaseInfo.VERSION} (${ReleaseInfo.BUILDDATE.toIsoLocalDate()})")
                     println(ReleaseInfo.WEBSITE)
                 }
                 else -> {
@@ -567,7 +567,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                     }
                     val nickname = p.getProperty("nick", Mobibot::class.java.name.lowercase())
                     val channel = p.getProperty("channel")
-                    val logsDir = ensureDir(p.getProperty("logs", "."), false)
+                    val logsDir = p.getProperty("logs", ".").toDir()
 
                     // Redirect stdout and stderr
                     if (!commandLine.hasOption(Constants.DEBUG_ARG[0])) {
@@ -637,7 +637,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
 
         // Set the URLs
         weblogUrl = p.getProperty("weblog", "")
-        backlogsUrl = ensureDir(p.getProperty("backlogs", weblogUrl), true)
+        backlogsUrl = p.getProperty("backlogs", weblogUrl).toDir(true)
 
         // Load the current entries and backlogs, if any
         try {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 82ce058..c5b4919 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -87,7 +87,7 @@ object Utils {
      * Capitalize a string.
      */
     @JvmStatic
-    fun capitalize(s: String?): String? = s?.replaceFirstChar { it.uppercase() }
+    fun String.capitalise(): String = this.replaceFirstChar { it.uppercase() }
 
     /**
      * Colorize a string.
@@ -115,30 +115,6 @@ object Utils {
     @JvmStatic
     fun encodeUrl(s: String): String = URLEncoder.encode(s, StandardCharsets.UTF_8)
 
-    /**
-     * Ensures that the given location (File/URL) has a trailing slash (`/`) to indicate a directory.
-     */
-    @JvmStatic
-    fun ensureDir(location: String, isUrl: Boolean): String {
-        return if (location.isNotEmpty()) {
-            if (isUrl) {
-                if (location[location.length - 1] == '/') {
-                    location
-                } else {
-                    "$location/"
-                }
-            } else {
-                if (location[location.length - 1] == File.separatorChar) {
-                    location
-                } else {
-                    location + File.separatorChar
-                }
-            }
-        } else {
-            location
-        }
-    }
-
     /**
      * Returns a property as an int.
      */
@@ -166,46 +142,27 @@ object Utils {
         return (if (isIndent) "    " else "").plus(if (isBold) bold(help) else help)
     }
 
-    /**
-     * Returns the specified date as an ISO local date string.
-     */
-    @JvmStatic
-    fun isoLocalDate(date: Date): String {
-        return isoLocalDate(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()))
-    }
-
-    /**
-     * Returns the specified date as an ISO local date string.
-     */
-    @JvmStatic
-    fun isoLocalDate(date: LocalDateTime): String = date.format(DateTimeFormatter.ISO_LOCAL_DATE)
-
     /**
      * Obfuscates the given string.
      */
     @JvmStatic
-    fun obfuscate(s: String): String {
-        return if (s.isNotBlank()) {
-            StringUtils.repeat('x', s.length)
-        } else s
+    fun String.obfuscate(): String {
+        return if (this.isNotBlank()) {
+            StringUtils.repeat('x', this.length)
+        } else this
     }
 
     /**
      * Returns the plural form of a word, if count &gt; 1.
      */
-    @JvmStatic
-    fun plural(count: Int, word: String, plural: String): String = plural(count.toLong(), word, plural)
-
+    fun String.plural(count: Int, plural: String): String = this.plural(count.toLong(), plural)
+    
     /**
      * Returns the plural form of a word, if count &gt; 1.
      */
     @JvmStatic
-    fun plural(count: Long, word: String, plural: String): String {
-        return if (count > 1) {
-            plural
-        } else {
-            word
-        }
+    fun String.plural(count: Long, plural: String): String {
+        return if (count > 1) plural else this
     }
 
     /**
@@ -224,7 +181,55 @@ object Utils {
      * Returns today's date.
      */
     @JvmStatic
-    fun today(): String = isoLocalDate(LocalDateTime.now())
+    fun today(): String = LocalDateTime.now().toIsoLocalDate()
+
+    /**
+     * Ensures that the given location (File/URL) has a trailing slash (`/`) to indicate a directory.
+     */
+    @JvmStatic
+    fun String.toDir(isUrl: Boolean = false) : String {
+        return if (isUrl) {
+            if (this.last() == '/') {
+                this
+            } else {
+                "$this/"
+            }
+        } else {
+            if (this.last() == File.separatorChar) {
+                this
+            } else {
+                this + File.separatorChar
+            }
+        }
+    }
+
+    /**
+     * Returns the specified date as an ISO local date string.
+     */
+    @JvmStatic
+    fun Date.toIsoLocalDate(): String {
+        return LocalDateTime.ofInstant(this.toInstant(), ZoneId.systemDefault()).toIsoLocalDate()
+    }
+
+    /**
+     * Returns the specified date as an ISO local date string.
+     */
+    @JvmStatic
+    fun LocalDateTime.toIsoLocalDate(): String = this.format(DateTimeFormatter.ISO_LOCAL_DATE)
+
+    /**
+     * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
+     */
+    @JvmStatic
+    fun Date.toUtcDateTime(): String {
+        return LocalDateTime.ofInstant(this.toInstant(), ZoneId.systemDefault()).toUtcDateTime()
+    }
+
+    /**
+     * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
+     */
+    @JvmStatic
+    fun LocalDateTime.toUtcDateTime(): String  = this.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
 
     /**
      * Converts XML/XHTML entities to plain text.
@@ -254,21 +259,21 @@ object Utils {
         )
         with(info) {
             if (years > 0) {
-                append(years).append(plural(years, " year ", " years "))
+                append(years).append(" year ".plural(years, " years "))
             }
             if (months > 0) {
-                append(weeks).append(plural(months, " month ", " months "))
+                append(weeks).append(" month ".plural(months, " months "))
             }
             if (weeks > 0) {
-                append(weeks).append(plural(weeks, " week ", " weeks "))
+                append(weeks).append(" week ".plural(weeks, " weeks "))
             }
             if (days > 0) {
-                append(days).append(plural(days, " day ", " days "))
+                append(days).append(" day ".plural(days, " days "))
             }
             if (hours > 0) {
-                append(hours).append(plural(hours, " hour ", " hours "))
+                append(hours).append(" hour ".plural(hours, " hours "))
             }
-            append(minutes).append(plural(minutes, " minute", " minutes"))
+            append(minutes).append(" minute ".plural(minutes, " minutes"))
             return toString()
         }
     }
@@ -282,20 +287,4 @@ object Utils {
         BufferedReader(InputStreamReader(url.openStream(), StandardCharsets.UTF_8))
             .use { reader -> return reader.lines().collect(Collectors.joining(System.lineSeparator())) }
     }
-
-    /**
-     * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
-     */
-    @JvmStatic
-    fun utcDateTime(date: Date): String {
-        return utcDateTime(LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()))
-    }
-
-    /**
-     * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
-     */
-    @JvmStatic
-    fun utcDateTime(date: LocalDateTime?): String {
-        return date?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) ?: ""
-    }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 2c02589..7675fe5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -33,7 +33,7 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import java.util.concurrent.ConcurrentHashMap
 
 abstract class AbstractCommand(val bot: Mobibot) {
@@ -56,7 +56,7 @@ abstract class AbstractCommand(val bot: Mobibot) {
     open fun helpResponse(command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
         if (!this.isOp || this.isOp == isOp) {
             for (h in help) {
-                bot.send(sender, Utils.buildCmdSyntax(h, bot.nick, isPrivate), isPrivate)
+                bot.send(sender, buildCmdSyntax(h, bot.nick, isPrivate), isPrivate)
             }
             return true
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
index cb635f2..ce4fd32 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -33,7 +33,9 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.commands.links.LinksMgr
 
 class Ignore(bot: Mobibot) : AbstractCommand(bot) {
@@ -46,17 +48,17 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
     override val name = IGNORE_CMD
     override val help = listOf(
         "To ignore a link posted to the channel:",
-        Utils.helpFormat("https://www.foo.bar %n"),
+        helpFormat("https://www.foo.bar %n"),
         "To check your ignore status:",
-        Utils.helpFormat("%c $name"),
+        helpFormat("%c $name"),
         "To toggle your ignore status:",
-        Utils.helpFormat("%c $name $me")
+        helpFormat("%c $name $me")
     )
     private val helpOp = listOf(
         "To ignore a link posted to the channel:",
-        Utils.helpFormat("https://www.foo.bar " + Utils.bold("%n"), false),
+        helpFormat("https://www.foo.bar " + bold("%n"), false),
         "To add/remove nicks from the ignored list:",
-        Utils.helpFormat("%c $name <nick> [<nick> ...]")
+        helpFormat("%c $name <nick> [<nick> ...]")
     )
 
     override val isOp = false
@@ -98,7 +100,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
     ): Boolean {
         return if (isOp) {
             for (h in helpOp) {
-                bot.send(sender, Utils.buildCmdSyntax(h, bot.nick, isPrivate), isPrivate)
+                bot.send(sender, buildCmdSyntax(h, bot.nick, isPrivate), isPrivate)
             }
             true
         } else {
@@ -143,7 +145,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
             @Suppress("MagicNumber")
             bot.sendList(sender, ignored.sorted(), 8, isPrivate, isIndent = true)
         } else {
-            bot.send(sender, "No one is currently ${Utils.bold("ignored")}.", isPrivate)
+            bot.send(sender, "No one is currently ${bold("ignored")}.", isPrivate)
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
index d3df42e..7d2fc84 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
@@ -33,7 +33,7 @@ package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.ReleaseInfo
-import net.thauvin.erik.mobibot.Utils.capitalize
+import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.uptime
@@ -42,8 +42,8 @@ import java.lang.management.ManagementFactory
 
 class Info(bot: Mobibot?) : AbstractCommand(bot!!) {
     private val allVersions = listOf(
-        capitalize(ReleaseInfo.PROJECT) + " ${ReleaseInfo.VERSION} (" + green(ReleaseInfo.WEBSITE) + ')',
-        "Written by ${ReleaseInfo.AUTHOR} (" + green(ReleaseInfo.AUTHOR_URL) + ')'
+        "${ReleaseInfo.PROJECT.capitalise()} ${ReleaseInfo.VERSION} (${green(ReleaseInfo.WEBSITE)})",
+        "Written by ${ReleaseInfo.AUTHOR} (${green(ReleaseInfo.AUTHOR_URL)})"
     )
     override val name = "info"
     override val help = listOf("To view information about the bot:", helpFormat("%c $name"))
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
index cbcf5d0..775b9ce 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -33,7 +33,8 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.toUtcDateTime
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import java.time.Clock
 import java.time.LocalDateTime
 
@@ -41,7 +42,7 @@ class Recap(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "recap"
     override val help = listOf(
         "To list the last 10 public channel messages:",
-        Utils.helpFormat("%c $name")
+        helpFormat("%c $name")
     )
     override val isOp = false
     override val isPublic = true
@@ -57,7 +58,7 @@ class Recap(bot: Mobibot) : AbstractCommand(bot) {
         @JvmStatic
         fun storeRecap(sender: String, message: String, isAction: Boolean) {
             recaps.add(
-                Utils.utcDateTime(LocalDateTime.now(Clock.systemUTC()))
+                LocalDateTime.now(Clock.systemUTC()).toUtcDateTime()
                     + " - $sender" + (if (isAction) " " else ": ") + message
             )
             @Suppress("MagicNumber")
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
index 57cd79b..c20d77e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
@@ -34,11 +34,11 @@ package net.thauvin.erik.mobibot.commands
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.ReleaseInfo
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.Utils.isoLocalDate
+import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
 
 class Versions(bot: Mobibot) : AbstractCommand(bot) {
     private val allVersions = listOf(
-        "Version:  ${ReleaseInfo.VERSION} (" + isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
+        "Version:  ${ReleaseInfo.VERSION} (${ReleaseInfo.BUILDDATE.toIsoLocalDate()})",
         "Platform: " + System.getProperty("os.name") + ' ' + System.getProperty("os.version")
             + " (" + System.getProperty("os.arch") + ')',
         "Runtime:  " + System.getProperty("java.runtime.name") + ' ' + System.getProperty("java.runtime.version")
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index 2ba9ae5..ce0b797 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -34,7 +34,9 @@ package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.Ignore
 import net.thauvin.erik.mobibot.entries.EntriesMgr
@@ -72,7 +74,7 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         val history = mutableListOf<String>()
 
         @JvmStatic
-        var startDate: String = Utils.today()
+        var startDate: String = today()
             private set
 
         /**
@@ -88,9 +90,9 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         @JvmStatic
         fun startup(current: String, backlogs: String, channel: String) {
             startDate = EntriesMgr.loadEntries(current, channel, entries)
-            if (Utils.today() != startDate) {
+            if (today() != startDate) {
                 entries.clear()
-                startDate = Utils.today()
+                startDate = today()
             }
             EntriesMgr.loadBacklogs(backlogs, history)
         }
@@ -144,7 +146,7 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
                     bot.send(sender, "Please specify a title, by typing:", isPrivate)
                     bot.send(
                         sender,
-                        Utils.helpFormat("${EntriesUtils.buildLinkCmd(index)}:|This is the title"),
+                        helpFormat("${EntriesUtils.buildLinkCmd(index)}:|This is the title"),
                         isPrivate
                     )
                 }
@@ -183,7 +185,7 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
             for (i in entries.indices) {
                 if (link == entries[i].link) {
                     val entry: EntryLink = entries[i]
-                    bot.send(sender, Utils.bold("Duplicate") + " >> " + EntriesUtils.buildLink(i, entry), isPrivate)
+                    bot.send(sender, bold("Duplicate") + " >> " + EntriesUtils.buildLink(i, entry), isPrivate)
                     return true
                 }
             }
@@ -201,10 +203,10 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun saveDayBackup(bot: Mobibot): Boolean {
-        if (Utils.today() != startDate) {
+        if (today() != startDate) {
             saveEntries(bot, true)
             entries.clear()
-            startDate = Utils.today()
+            startDate = today()
             return true
         }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index 9052110..9404287 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -38,7 +38,7 @@ import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.plural
 import net.thauvin.erik.mobibot.Utils.reverseColor
-import net.thauvin.erik.mobibot.Utils.utcDateTime
+import net.thauvin.erik.mobibot.Utils.toUtcDateTime
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.View
 
@@ -117,21 +117,16 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
      */
     override val name = "tell"
 
-    override val help: List<String>
-        get() = listOf(
+    override val help  = listOf(
             "To send a message to someone when they join the channel:",
             helpFormat("%c $name <nick> <message>"),
             "To view queued and sent messages:",
             helpFormat("%c $name ${View.VIEW_CMD}"),
-            "Messages are kept for " + bold(maxDays)
-                + plural(maxDays, " day.", " days.")
+            "Messages are kept for ${bold(maxDays)}" + " day.".plural(maxDays, " days.")
         )
-    override val isOp: Boolean
-        get() = false
-    override val isPublic: Boolean
-        get() = isEnabled()
-    override val isVisible: Boolean
-        get() = isEnabled()
+    override val isOp: Boolean = false
+    override val isPublic: Boolean = isEnabled()
+    override val isVisible: Boolean = isEnabled()
 
     override fun commandResponse(
         sender: String,
@@ -232,8 +227,8 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                         && !message.isNotified) {
                         bot.send(
                             nickname,
-                            "Your message ${reverseColor("[ID " + message.id + ']')} was sent to " +
-                                "${bold(message.recipient)} on ${utcDateTime(message.receptionDate)}",
+                            "Your message ${reverseColor("[ID " + message.id + ']')} was sent to "
+                                + "${bold(message.recipient)} on ${message.receptionDate.toUtcDateTime()}",
                             true
                         )
                         message.isNotified = true
@@ -248,9 +243,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
      *
      * @return The size.
      */
-    fun size(): Int {
-        return messages.size
-    }
+    fun size(): Int = messages.size
 
     // View all messages.
     private fun viewAll(sender: String, isPrivate: Boolean) {
@@ -281,7 +274,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                     bot.send(
                         sender,
                         bold(message.sender) + ARROW + bold(message.recipient)
-                            + " [" + utcDateTime(message.receptionDate) + ", ID: "
+                            + " [${message.receptionDate.toUtcDateTime()}, ID: "
                             + bold(message.id) + ", DELIVERED]",
                         isPrivate
                     )
@@ -289,7 +282,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                     bot.send(
                         sender,
                         bold(message.sender) + ARROW + bold(message.recipient)
-                            + " [" + utcDateTime(message.queued) + ", ID: "
+                            + " [${message.queued.toUtcDateTime()}, ID: "
                             + bold(message.id) + ", QUEUED]",
                         isPrivate
                     )
@@ -312,11 +305,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                 ),
                 isPrivate
             )
-            bot.send(
-                sender,
-                "Messages are kept for ${bold(maxDays)}${plural(maxDays, " day.", " days.")}",
-                isPrivate
-            )
+            bot.send(sender, help.last(), isPrivate)
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index 50a8e6a..ca74eae 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -40,7 +40,7 @@ import com.rometools.rome.io.FeedException
 import com.rometools.rome.io.SyndFeedInput
 import com.rometools.rome.io.SyndFeedOutput
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.isoLocalDate
+import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
 import java.io.IOException
 import java.io.InputStreamReader
 import java.io.OutputStreamWriter
@@ -146,7 +146,7 @@ object EntriesMgr {
             Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8
         ).use { reader ->
             val feed = input.build(reader)
-            today = isoLocalDate(feed.publishedDate)
+            today = feed.publishedDate.toIsoLocalDate()
             val items = feed.entries
             var entry: EntryLink
             for (i in items.indices.reversed()) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index acf3669..fc5decf 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -33,7 +33,10 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.PublicMessage
@@ -56,7 +59,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         isPrivate: Boolean
     ) {
         synchronized(this) {
-            if (pubDate != Utils.today()) {
+            if (pubDate != today()) {
                 EXCHANGE_RATES.clear()
             }
         }
@@ -85,7 +88,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                     helpResponse(sender, isPrivate)
                 }
             } else if (args.contains(CURRENCY_RATES_KEYWORD)) {
-                send(sender, "The currency rates for ${Utils.bold(pubDate)} are:", isPrivate)
+                send(sender, "The currency rates for ${bold(pubDate)} are:", isPrivate)
                 @Suppress("MagicNumber")
                 sendList(sender, currencyRates(), 3, isPrivate, isIndent = true)
             } else {
@@ -109,16 +112,16 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 send(sender, "To convert from one currency to another:", isPrivate)
                 send(
                     sender,
-                    Utils.helpFormat(
-                        Utils.buildCmdSyntax("%c $CURRENCY_CMD 100 USD to EUR", nick, isPrivateMsgEnabled)
+                    helpFormat(
+                        buildCmdSyntax("%c $CURRENCY_CMD 100 USD to EUR", nick, isPrivateMsgEnabled)
                     ),
                     isPrivate
                 )
                 send(sender, "For a listing of current rates:", isPrivate)
                 send(
                     sender,
-                    Utils.helpFormat(
-                        Utils.buildCmdSyntax("%c $CURRENCY_CMD $CURRENCY_RATES_KEYWORD", nick, isPrivateMsgEnabled)
+                    helpFormat(
+                        buildCmdSyntax("%c $CURRENCY_CMD $CURRENCY_RATES_KEYWORD", nick, isPrivateMsgEnabled)
                     ),
                     isPrivate
                 )
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index eeff387..80dc091 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -32,7 +32,11 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.capitalise
+import net.thauvin.erik.mobibot.Utils.encodeUrl
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.urlReader
+import net.thauvin.erik.mobibot.Utils.unescapeXml
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
 import org.jibble.pircbot.Colors
@@ -86,21 +90,21 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
         @Throws(ModuleException::class)
         fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List<Message> {
             if (apiKey.isNullOrBlank() || cseKey.isNullOrBlank()) {
-                throw ModuleException("${Utils.capitalize(GOOGLE_CMD)} is disabled. The API keys are missing.")
+                throw ModuleException("${GOOGLE_CMD.capitalise()} is disabled. The API keys are missing.")
             }
             return if (query.isNotBlank()) {
                 val results = mutableListOf<Message>()
                 try {
                     val url = URL(
                         "https://www.googleapis.com/customsearch/v1?key=$apiKey&cx=$cseKey" +
-                            "&q=${Utils.encodeUrl(query)}&filter=1&num=5&alt=json"
+                            "&q=${encodeUrl(query)}&filter=1&num=5&alt=json"
                     )
-                    val json = JSONObject(Utils.urlReader(url))
+                    val json = JSONObject(urlReader(url))
                     val ja = json.getJSONArray("items")
                     for (i in 0 until ja.length()) {
                         val j = ja.getJSONObject(i)
-                        results.add(NoticeMessage(Utils.unescapeXml(j.getString("title"))))
-                        results.add(NoticeMessage(Utils.helpFormat(j.getString("link"), false), Colors.DARK_GREEN))
+                        results.add(NoticeMessage(unescapeXml(j.getString("title"))))
+                        results.add(NoticeMessage(helpFormat(j.getString("link"), false), Colors.DARK_GREEN))
                     }
                 } catch (e: IOException) {
                     throw ModuleException("searchGoogle($query)", "An IO error has occurred searching Google.", e)
@@ -117,7 +121,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(GOOGLE_CMD)
         help.add("To search Google:")
-        help.add(Utils.helpFormat("%c $GOOGLE_CMD <query>"))
+        help.add(helpFormat("%c $GOOGLE_CMD <query>"))
         initProperties(GOOGLE_API_KEY_PROP, GOOGLE_CSE_KEY_PROP)
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
index 8ac1786..f2624ec 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -32,7 +32,9 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.cyan
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.urlReader
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.PublicMessage
 import org.json.JSONException
@@ -58,7 +60,7 @@ class Joke(bot: Mobibot) : ThreadedModule(bot) {
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
         try {
-            bot.send(Utils.cyan(randomJoke().msg))
+            bot.send(cyan(randomJoke().msg))
         } catch (e: ModuleException) {
             if (bot.logger.isWarnEnabled) bot.logger.warn(e.debugMessage, e)
             bot.send(sender, e.message, isPrivate)
@@ -81,7 +83,7 @@ class Joke(bot: Mobibot) : ThreadedModule(bot) {
         fun randomJoke(): Message {
             return try {
                 val url = URL(JOKE_URL)
-                val json = JSONObject(Utils.urlReader(url))
+                val json = JSONObject(urlReader(url))
                 PublicMessage(
                     json.getJSONObject("value")["joke"].toString().replace("\\'", "'")
                         .replace("\\\"", "\"")
@@ -97,6 +99,6 @@ class Joke(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(JOKE_CMD)
         help.add("To retrieve a random joke:")
-        help.add(Utils.helpFormat("%c $JOKE_CMD"))
+        help.add(helpFormat("%c $JOKE_CMD"))
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
index c970aca..48a0462 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -68,7 +68,7 @@ class ModuleException : Exception {
      * Return the sanitized message (e.g. remove API keys, etc.)
      */
     fun getSanitizedMessage(vararg sanitize: String): String {
-        val obfuscate = sanitize.map { obfuscate(it) }.toTypedArray()
+        val obfuscate = sanitize.map { it.obfuscate() }.toTypedArray()
         return when {
             cause != null -> {
                 cause.javaClass.name + ": " + StringUtils.replaceEach(cause.message, sanitize, obfuscate)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index cb8a825..6f7528b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -33,7 +33,10 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.green
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.red
 import kotlin.random.Random
 
 
@@ -51,7 +54,7 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
         with(help) {
             add("To play Rock Paper Scissors:")
             add(
-                Utils.helpFormat(
+                helpFormat(
                     "%c ${Hands.ROCK.name.lowercase()} | ${Hands.PAPER.name.lowercase()}"
                         + " | ${Hands.SCISSORS.name.lowercase()}"
                 )
@@ -99,15 +102,15 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
         with(bot) {
             when {
                 hand == botHand -> {
-                    send("${Utils.green(hand.name)} vs. ${Utils.green(botHand.name)}")
+                    send("${green(hand.name)} vs. ${green(botHand.name)}")
                     action("tied.")
                 }
                 hand.beats(botHand) -> {
-                    send("${Utils.green(hand.name)} ${Utils.bold(hand.action)} ${Utils.red(botHand.name)}")
+                    send("${green(hand.name)} ${bold(hand.action)} ${red(botHand.name)}")
                     action("lost.")
                 }
                 else -> {
-                    send("${Utils.green(botHand.name)} ${Utils.bold(botHand.action)} ${Utils.red(hand.name)}")
+                    send("${green(botHand.name)} ${bold(botHand.action)} ${red(hand.name)}")
                     action("wins.")
                 }
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 60c5f0f..46423c3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -32,7 +32,11 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.capitalise
+import net.thauvin.erik.mobibot.Utils.encodeUrl
+import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.unescapeXml
+import net.thauvin.erik.mobibot.Utils.urlReader
 import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
@@ -91,7 +95,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                 try {
                     val info = json.getString("Information")
                     if (info.isNotEmpty()) {
-                        throw ModuleException(debugMessage, Utils.unescapeXml(info))
+                        throw ModuleException(debugMessage, unescapeXml(info))
                     }
                 } catch (ignore: JSONException) {
                     // Do nothing
@@ -99,11 +103,11 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                 try {
                     var error = json.getString("Note")
                     if (error.isNotEmpty()) {
-                        throw ModuleException(debugMessage, Utils.unescapeXml(error))
+                        throw ModuleException(debugMessage, unescapeXml(error))
                     }
                     error = json.getString("Error Message")
                     if (error.isNotEmpty()) {
-                        throw ModuleException(debugMessage, Utils.unescapeXml(error))
+                        throw ModuleException(debugMessage, unescapeXml(error))
                     }
                 } catch (ignore: JSONException) {
                     // Do nothing
@@ -122,7 +126,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
         fun getQuote(symbol: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
                 throw ModuleException(
-                    "${Utils.capitalize(STOCK_CMD)} is disabled. The API key is missing."
+                    "${STOCK_CMD.capitalise()} is disabled. The API key is missing."
                 )
             }
             return if (symbol.isNotBlank()) {
@@ -132,10 +136,10 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                 try {
                     with(messages) {
                         // Search for symbol/keywords
-                        response = Utils.urlReader(
+                        response = urlReader(
                             URL(
-                                "${ALPHAVANTAGE_URL}SYMBOL_SEARCH&keywords=" + Utils.encodeUrl(symbol)
-                                    + "&apikey=" + Utils.encodeUrl(apiKey)
+                                "${ALPHAVANTAGE_URL}SYMBOL_SEARCH&keywords=" + encodeUrl(symbol)
+                                    + "&apikey=" + encodeUrl(apiKey)
                             )
                         )
                         var json = getJsonResponse(response, debugMessage)
@@ -146,11 +150,11 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                             val symbolInfo = symbols.getJSONObject(0)
 
                             // Get quote for symbol
-                            response = Utils.urlReader(
+                            response = urlReader(
                                 URL(
                                     "${ALPHAVANTAGE_URL}GLOBAL_QUOTE&symbol="
-                                        + Utils.encodeUrl(symbolInfo.getString("1. symbol"))
-                                        + "&apikey=" + Utils.encodeUrl(apiKey)
+                                        + encodeUrl(symbolInfo.getString("1. symbol"))
+                                        + "&apikey=" + encodeUrl(apiKey)
                                 )
                             )
                             json = getJsonResponse(response, debugMessage)
@@ -161,34 +165,28 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                             }
                             add(
                                 PublicMessage(
-                                    "Symbol: " + Utils.unescapeXml(quote.getString("01. symbol"))
-                                        + " [" + Utils.unescapeXml(symbolInfo.getString("2. name")) + ']'
+                                    "Symbol: " + unescapeXml(quote.getString("01. symbol"))
+                                        + " [" + unescapeXml(symbolInfo.getString("2. name")) + ']'
                                 )
                             )
-                            add(PublicMessage("    Price:     " + Utils.unescapeXml(quote.getString("05. price"))))
+                            add(PublicMessage("    Price:     " + unescapeXml(quote.getString("05. price"))))
                             add(
                                 PublicMessage(
-                                    "    Previous:  " + Utils.unescapeXml(quote.getString("08. previous close"))
+                                    "    Previous:  " + unescapeXml(quote.getString("08. previous close"))
                                 )
                             )
-                            add(NoticeMessage("    Open:      " + Utils.unescapeXml(quote.getString("02. open"))))
-                            add(NoticeMessage("    High:      " + Utils.unescapeXml(quote.getString("03. high"))))
-                            add(NoticeMessage("    Low:       " + Utils.unescapeXml(quote.getString("04. low"))))
-                            add(
-                                NoticeMessage(
-                                    "    Volume:    " + Utils.unescapeXml(quote.getString("06. volume"))
+                            add(NoticeMessage("    Open:      " + unescapeXml(quote.getString("02. open"))))
+                            add(NoticeMessage("    High:      " + unescapeXml(quote.getString("03. high"))))
+                            add(NoticeMessage("    Low:       " + unescapeXml(quote.getString("04. low"))))
+                            add(NoticeMessage("    Volume:    " + unescapeXml(quote.getString("06. volume"))))
+                            add(NoticeMessage(
+                                    "    Latest:    " + unescapeXml(quote.getString("07. latest trading day"))
                                 )
                             )
                             add(
                                 NoticeMessage(
-                                    "    Latest:    "
-                                        + Utils.unescapeXml(quote.getString("07. latest trading day"))
-                                )
-                            )
-                            add(
-                                NoticeMessage(
-                                    "    Change:    " + Utils.unescapeXml(quote.getString("09. change")) + " ["
-                                        + Utils.unescapeXml(quote.getString("10. change percent")) + ']'
+                                    "    Change:    " + unescapeXml(quote.getString("09. change")) + " ["
+                                        + unescapeXml(quote.getString("10. change percent")) + ']'
                                 )
                             )
                         }
@@ -208,7 +206,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(STOCK_CMD)
         help.add("To retrieve a stock quote:")
-        help.add(Utils.helpFormat("%c $STOCK_CMD <symbol|keywords>"))
+        help.add(helpFormat("%c $STOCK_CMD <symbol|keywords>"))
         initProperties(ALPHAVANTAGE_API_KEY_PROP)
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index ae49759..77631cd 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -36,7 +36,10 @@ import net.aksingh.owmjapis.core.OWM
 import net.aksingh.owmjapis.core.OWM.Country
 import net.aksingh.owmjapis.model.CurrentWeather
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.capitalise
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.encodeUrl
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
@@ -102,7 +105,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
         fun getWeather(query: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
                 throw ModuleException(
-                    "${Utils.capitalize(WEATHER_CMD)} is disabled. The API key is missing."
+                    "${WEATHER_CMD.capitalise()} is disabled. The API key is missing."
                 )
             }
             val owm = OWM(apiKey)
@@ -151,7 +154,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                                     for (w in list) {
                                         if (w != null) {
                                             condition.append(' ')
-                                                .append(Utils.capitalize(w.getDescription()))
+                                                .append(w.getDescription().capitalise())
                                                 .append('.')
                                         }
                                     }
@@ -167,7 +170,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                                     messages.add(
                                         NoticeMessage(
                                             "https://openweathermap.org/find?q="
-                                                + Utils.encodeUrl("$city,${country.uppercase()}"),
+                                                + encodeUrl("$city,${country.uppercase()}"),
                                             Colors.GREEN
                                         )
                                     )
@@ -197,10 +200,10 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
     init {
         commands.add(WEATHER_CMD)
         help.add("To display weather information:")
-        help.add(Utils.helpFormat("%c $WEATHER_CMD <city> [, <country code>]"))
+        help.add(helpFormat("%c $WEATHER_CMD <city> [, <country code>]"))
         help.add("For example:")
-        help.add(Utils.helpFormat("%c $WEATHER_CMD paris, fr"))
-        help.add("The default ISO 3166 country code is ${Utils.bold("US")}. Zip codes supported in most countries.")
+        help.add(helpFormat("%c $WEATHER_CMD paris, fr"))
+        help.add("The default ISO 3166 country code is ${bold("US")}. Zip codes supported in most countries.")
         initProperties(OWM_API_KEY_PROP)
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 78c91ec..7c769e9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -77,7 +77,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             val tz = COUNTRIES_MAP[(query.substring(query.indexOf(' ') + 1).trim()).uppercase()]
             val response: String = if (tz != null) {
                 if (BEATS_KEYWORD == tz) {
-                    "The current Internet Time is: " + bold(internetTime() + ' ' + BEATS_KEYWORD)
+                    "The current Internet Time is: ${bold(internetTime())} $BEATS_KEYWORD"
                 } else {
                     (ZonedDateTime.now()
                         .withZoneSameInstant(ZoneId.of(tz))
@@ -215,7 +215,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
 
     init {
         help.add("To display a country's current date/time:")
-        help.add(helpFormat("%c $TIME_CMD") + " [<country code>]")
+        help.add(helpFormat("%c $TIME_CMD [<country code>]"))
         help.add("For a listing of the supported countries:")
         help.add(helpFormat("%c $TIME_CMD"))
         commands.add(TIME_CMD)
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 8b75b72..a28aee5 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -35,18 +35,18 @@ import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.capitalize
 import net.thauvin.erik.mobibot.Utils.colorize
 import net.thauvin.erik.mobibot.Utils.cyan
-import net.thauvin.erik.mobibot.Utils.ensureDir
 import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.green
-import net.thauvin.erik.mobibot.Utils.isoLocalDate
 import net.thauvin.erik.mobibot.Utils.obfuscate
 import net.thauvin.erik.mobibot.Utils.plural
 import net.thauvin.erik.mobibot.Utils.reverseColor
+import net.thauvin.erik.mobibot.Utils.toDir
+import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
+import net.thauvin.erik.mobibot.Utils.toUtcDateTime
 import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.Utils.unescapeXml
 import net.thauvin.erik.mobibot.Utils.uptime
 import net.thauvin.erik.mobibot.Utils.urlReader
-import net.thauvin.erik.mobibot.Utils.utcDateTime
 import org.apache.commons.lang3.StringUtils
 import org.assertj.core.api.Assertions.assertThat
 import org.jibble.pircbot.Colors
@@ -101,13 +101,6 @@ class UtilsTest {
         assertThat(cyan(ascii)).isEqualTo(Colors.CYAN + ascii + Colors.NORMAL)
     }
 
-    @Test
-    fun testEnsureDir() {
-        assertThat(ensureDir("dir", false)).describedAs("ensureDir(dir, false)").isEqualTo("dir" + File.separatorChar)
-        assertThat(ensureDir("https://erik.thauvin.net", true)).describedAs("ensureDir(erik.thauvin.net, true)")
-            .isEqualTo("https://erik.thauvin.net/")
-    }
-
     @Test
     fun testGetIntProperty() {
         assertThat(getIntProperty("10", 1)).describedAs("getIntProperty(10, 1)").isEqualTo(10)
@@ -121,25 +114,25 @@ class UtilsTest {
 
     @Test
     fun testIsoLocalDate() {
-        assertThat(isoLocalDate(cal.time)).describedAs("isoLocalDate(date)").isEqualTo("1952-02-17")
-        assertThat(isoLocalDate(localDateTime)).describedAs("isoLocalDate(localDate)").isEqualTo("1952-02-17")
+        assertThat(cal.time.toIsoLocalDate()).describedAs("isoLocalDate(date)").isEqualTo("1952-02-17")
+        assertThat(localDateTime.toIsoLocalDate()).describedAs("isoLocalDate(localDate)").isEqualTo("1952-02-17")
     }
 
     @Test
     fun testObfuscate() {
-        assertThat(obfuscate(ascii).length).describedAs("obfuscate is right length").isEqualTo(ascii.length)
-        assertThat(obfuscate(ascii)).describedAs("obfuscate()").isEqualTo(StringUtils.repeat("x", ascii.length))
-        assertThat(obfuscate(" ")).describedAs("obfuscate(blank)").isEqualTo(" ")
+        assertThat(ascii.obfuscate().length).describedAs("obfuscate is right length").isEqualTo(ascii.length)
+        assertThat(ascii.obfuscate()).describedAs("obfuscate()").isEqualTo(StringUtils.repeat("x", ascii.length))
+        assertThat(" ".obfuscate()).describedAs("obfuscate(blank)").isEqualTo(" ")
     }
 
     @Test
     fun testPlural() {
         val week = "week"
         val weeks = "weeks"
-        assertThat(plural(-1, week, weeks)).describedAs("plural(-1)").isEqualTo(week)
-        assertThat(plural(0, week, weeks)).describedAs("plural(0)").isEqualTo(week)
-        assertThat(plural(1, week, weeks)).describedAs("plural(1)").isEqualTo(week)
-        assertThat(plural(2, week, weeks)).describedAs("plural(2)").isEqualTo(weeks)
+        assertThat(week.plural(-1, weeks)).describedAs("plural(-1)").isEqualTo(week)
+        assertThat(week.plural(0, weeks)).describedAs("plural(0)").isEqualTo(week)
+        assertThat(week.plural(1, weeks)).describedAs("plural(1)").isEqualTo(week)
+        assertThat(week.plural(2, weeks)).describedAs("plural(2)").isEqualTo(weeks)
     }
 
     @Test
@@ -149,7 +142,14 @@ class UtilsTest {
 
     @Test
     fun testToday() {
-        assertThat(today()).isEqualTo(isoLocalDate(LocalDateTime.now()))
+        assertThat(today()).isEqualTo(LocalDateTime.now().toIsoLocalDate())
+    }
+
+    @Test
+    fun testToDir() {
+        assertThat("dir".toDir(false)).describedAs("toDir(dir, false)").isEqualTo("dir" + File.separatorChar)
+        assertThat("https://erik.thauvin.net".toDir(true)).describedAs("toDir(erik.thauvin.net, true)")
+            .isEqualTo("https://erik.thauvin.net/")
     }
 
     @Test
@@ -174,7 +174,7 @@ class UtilsTest {
 
     @Test
     fun testUtcDateTime() {
-        assertThat(utcDateTime(cal.time)).describedAs("utcDateTime(date)").isEqualTo("1952-02-17 12:30")
-        assertThat(utcDateTime(localDateTime)).describedAs("utcDateTime(localDate)").isEqualTo("1952-02-17 12:30")
+        assertThat(cal.time.toUtcDateTime()).describedAs("utcDateTime(date)").isEqualTo("1952-02-17 12:30")
+        assertThat(localDateTime.toUtcDateTime()).describedAs("utcDateTime(localDate)").isEqualTo("1952-02-17 12:30")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
index 4064672..8a78beb 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.objecthunter.exp4j.tokenizer.UnknownFunctionOrVariableException
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.modules.Calc.Companion.calculate
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
@@ -44,10 +44,10 @@ import org.testng.annotations.Test
 class CalcTest {
     @Test
     fun testCalculate() {
-        assertThat(calculate("1 + 1")).describedAs("calculate(1+1)").isEqualTo("1+1 = %s", Utils.bold(2))
-        assertThat(calculate("1 -3")).describedAs("calculate(1 -3)").isEqualTo("1-3 = %s", Utils.bold(-2))
+        assertThat(calculate("1 + 1")).describedAs("calculate(1+1)").isEqualTo("1+1 = %s", bold(2))
+        assertThat(calculate("1 -3")).describedAs("calculate(1 -3)").isEqualTo("1-3 = %s", bold(-2))
         assertThat(calculate("pi+π+e+φ")).describedAs("calculate(pi+π+e+φ)")
-            .isEqualTo("pi+π+e+φ = %s", Utils.bold("10.62"))
+            .isEqualTo("pi+π+e+φ = %s", bold("10.62"))
         assertThatThrownBy { calculate("one + one") }.describedAs("calculate(one+one)")
             .isInstanceOf(UnknownFunctionOrVariableException::class.java)
     }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index d0c3e00..73a2007 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -31,7 +31,7 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Utils
+import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.modules.WorldTime.Companion.time
 import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
@@ -42,7 +42,7 @@ import org.testng.annotations.Test
 class WordTimeTest {
     @Test
     fun testTime() {
-        assertThat(time("PST").msg).describedAs("PST").endsWith(Utils.bold("Los Angeles"))
+        assertThat(time("PST").msg).describedAs("PST").endsWith(bold("Los Angeles"))
         assertThat(time("BLAH").isError).describedAs("BLAH").isTrue
         assertThat(time("BEATS").msg).describedAs("BEATS").contains("@")
     }
diff --git a/version.properties b/version.properties
index 3846e61..88ee6f9 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Thu May 13 21:34:31 PDT 2021
-version.buildmeta=771
+#Fri May 14 20:13:13 PDT 2021
+version.buildmeta=782
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+771
+version.semver=0.8.0-beta+782

From 8098a4855d0701c7e236c3edb0748f1b2fb8cbc7 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 14 May 2021 21:46:23 -0700
Subject: [PATCH 161/262] Cleanup.

---
 .../net/thauvin/erik/mobibot/modules/War.java   |  1 -
 .../kotlin/net/thauvin/erik/mobibot/Mobibot.kt  |  4 ++--
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt    |  6 +++---
 .../net/thauvin/erik/mobibot/commands/Recap.kt  |  2 +-
 .../thauvin/erik/mobibot/commands/tell/Tell.kt  | 17 +++++++++--------
 .../erik/mobibot/modules/GoogleSearch.kt        |  2 +-
 .../thauvin/erik/mobibot/modules/StockQuote.kt  |  3 ++-
 .../thauvin/erik/mobibot/modules/Weather2.kt    |  2 +-
 .../net/thauvin/erik/mobibot/UtilsTest.kt       | 16 ++++++++--------
 version.properties                              |  6 +++---
 10 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 7795e33..ddd56a2 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -44,7 +44,6 @@ import static net.thauvin.erik.mobibot.Utils.bold;
  * The War module.
  *
  * @author <a href="https://erik.thauvin.net" target="_blank">Erik C. Thauvin</a>
- * @created 2014-04-28
  * @since 1.0
  */
 public final class War extends AbstractModule {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 2bb5d56..af81bc8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -38,9 +38,9 @@ import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.colorize
 import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.Utils.today
-import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
 import net.thauvin.erik.mobibot.Utils.toDir
+import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
+import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.commands.AddLog
 import net.thauvin.erik.mobibot.commands.ChannelFeed
 import net.thauvin.erik.mobibot.commands.Cycle
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index c5b4919..3a07ac3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -156,7 +156,7 @@ object Utils {
      * Returns the plural form of a word, if count &gt; 1.
      */
     fun String.plural(count: Int, plural: String): String = this.plural(count.toLong(), plural)
-    
+
     /**
      * Returns the plural form of a word, if count &gt; 1.
      */
@@ -187,7 +187,7 @@ object Utils {
      * Ensures that the given location (File/URL) has a trailing slash (`/`) to indicate a directory.
      */
     @JvmStatic
-    fun String.toDir(isUrl: Boolean = false) : String {
+    fun String.toDir(isUrl: Boolean = false): String {
         return if (isUrl) {
             if (this.last() == '/') {
                 this
@@ -229,7 +229,7 @@ object Utils {
      * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
      */
     @JvmStatic
-    fun LocalDateTime.toUtcDateTime(): String  = this.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+    fun LocalDateTime.toUtcDateTime(): String = this.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
 
     /**
      * Converts XML/XHTML entities to plain text.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
index 775b9ce..2f21dc6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -33,8 +33,8 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.toUtcDateTime
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.toUtcDateTime
 import java.time.Clock
 import java.time.LocalDateTime
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index 9404287..72fd262 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -117,13 +117,13 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
      */
     override val name = "tell"
 
-    override val help  = listOf(
-            "To send a message to someone when they join the channel:",
-            helpFormat("%c $name <nick> <message>"),
-            "To view queued and sent messages:",
-            helpFormat("%c $name ${View.VIEW_CMD}"),
-            "Messages are kept for ${bold(maxDays)}" + " day.".plural(maxDays, " days.")
-        )
+    override val help = listOf(
+        "To send a message to someone when they join the channel:",
+        helpFormat("%c $name <nick> <message>"),
+        "To view queued and sent messages:",
+        helpFormat("%c $name ${View.VIEW_CMD}"),
+        "Messages are kept for ${bold(maxDays)}" + " day.".plural(maxDays, " days.")
+    )
     override val isOp: Boolean = false
     override val isPublic: Boolean = isEnabled()
     override val isVisible: Boolean = isEnabled()
@@ -224,7 +224,8 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                             save()
                         }
                     } else if (message.sender.equals(nickname, ignoreCase = true) && message.isReceived
-                        && !message.isNotified) {
+                        && !message.isNotified
+                    ) {
                         bot.send(
                             nickname,
                             "Your message ${reverseColor("[ID " + message.id + ']')} was sent to "
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index 80dc091..8184881 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -35,8 +35,8 @@ import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.encodeUrl
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.Utils.urlReader
 import net.thauvin.erik.mobibot.Utils.unescapeXml
+import net.thauvin.erik.mobibot.Utils.urlReader
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
 import org.jibble.pircbot.Colors
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 46423c3..4b4bec1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -179,7 +179,8 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                             add(NoticeMessage("    High:      " + unescapeXml(quote.getString("03. high"))))
                             add(NoticeMessage("    Low:       " + unescapeXml(quote.getString("04. low"))))
                             add(NoticeMessage("    Volume:    " + unescapeXml(quote.getString("06. volume"))))
-                            add(NoticeMessage(
+                            add(
+                                NoticeMessage(
                                     "    Latest:    " + unescapeXml(quote.getString("07. latest trading day"))
                                 )
                             )
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index 77631cd..238952b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -36,8 +36,8 @@ import net.aksingh.owmjapis.core.OWM
 import net.aksingh.owmjapis.core.OWM.Country
 import net.aksingh.owmjapis.model.CurrentWeather
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.encodeUrl
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.msg.ErrorMessage
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index a28aee5..0a77475 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot
 
 import net.thauvin.erik.mobibot.Utils.bold
-import net.thauvin.erik.mobibot.Utils.capitalize
+import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.colorize
 import net.thauvin.erik.mobibot.Utils.cyan
 import net.thauvin.erik.mobibot.Utils.getIntProperty
@@ -79,11 +79,10 @@ class UtilsTest {
     }
 
     @Test
-    fun testCapitalize() {
-        assertThat(capitalize("test")).describedAs("capitalize(test)").isEqualTo("Test")
-        assertThat(capitalize("Test")).describedAs("capitalize(Test)").isEqualTo("Test")
-        assertThat(capitalize(null)).describedAs("captitalize(null)").isNull()
-        assertThat(capitalize("")).describedAs("capitalize()").isEqualTo("")
+    fun testCapitalise() {
+        assertThat("test".capitalise()).describedAs("capitalize(test)").isEqualTo("Test")
+        assertThat("Test".capitalise()).describedAs("capitalize(Test)").isEqualTo("Test")
+        assertThat("".capitalise()).describedAs("capitalize()").isEqualTo("")
     }
 
     @Test
@@ -168,8 +167,9 @@ class UtilsTest {
     @Throws(IOException::class)
     fun testUrlReader() {
         assertThat(urlReader(URL("https://postman-echo.com/status/200"))).describedAs("urlReader()")
-            .isEqualTo("{\"status\":200}"
-        )
+            .isEqualTo(
+                "{\"status\":200}"
+            )
     }
 
     @Test
diff --git a/version.properties b/version.properties
index 88ee6f9..5c5888f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri May 14 20:13:13 PDT 2021
-version.buildmeta=782
+#Fri May 14 21:44:23 PDT 2021
+version.buildmeta=787
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+782
+version.semver=0.8.0-beta+787

From 2de9dc66bd906fae0765dea970ffd04f5c33a0ee Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 15 May 2021 01:26:31 -0700
Subject: [PATCH 162/262] Added more Utils extensions.

---
 .../net/thauvin/erik/mobibot/Mobibot.kt       |  2 +-
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  | 21 +++++++++++++------
 .../erik/mobibot/commands/tell/Tell.kt        |  6 +++---
 .../net/thauvin/erik/mobibot/UtilsTest.kt     | 15 +++++++++++--
 version.properties                            |  6 +++---
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index af81bc8..c6390f0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -616,7 +616,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
 
         name = nickname
         ircServer = p.getProperty("server", Constants.DEFAULT_SERVER)
-        ircPort = getIntProperty(p.getProperty("port"), Constants.DEFAULT_PORT)
+        ircPort = p.getIntProperty("port", Constants.DEFAULT_PORT)
         this.channel = channel
         logsDir = logsDirPath
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 3a07ac3..f55ff61 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -45,6 +45,7 @@ import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Date
+import java.util.Properties
 import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
 
@@ -119,12 +120,8 @@ object Utils {
      * Returns a property as an int.
      */
     @JvmStatic
-    fun getIntProperty(property: String?, def: Int): Int {
-        return try {
-            property?.toInt() ?: def
-        } catch (nfe: NumberFormatException) {
-            def
-        }
+    fun Properties.getIntProperty(key: String, defaultValue: Int): Int {
+        return this.getProperty(key)?.toIntOrDefault(defaultValue) ?: defaultValue
     }
 
     /**
@@ -203,6 +200,18 @@ object Utils {
         }
     }
 
+    /**
+     * Converts a string to an int.
+     */
+    @JvmStatic
+    fun String.toIntOrDefault(defaultValue: Int): Int {
+        return try {
+            this.toInt()
+        } catch (e: NumberFormatException) {
+            defaultValue
+        }
+    }
+
     /**
      * Returns the specified date as an ISO local date string.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index 72fd262..cd59eac 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -34,10 +34,10 @@ 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.plural
 import net.thauvin.erik.mobibot.Utils.reverseColor
+import net.thauvin.erik.mobibot.Utils.toIntOrDefault
 import net.thauvin.erik.mobibot.Utils.toUtcDateTime
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.View
@@ -162,9 +162,9 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
     override fun setProperty(key: String, value: String) {
         super.setProperty(key, value)
         if (MAX_DAYS_PROP == key) {
-            maxDays = getIntProperty(value, maxDays)
+            maxDays = value.toIntOrDefault(maxDays)
         } else if (MAX_SIZE_PROP == key) {
-            maxSize = getIntProperty(value, maxSize)
+            maxSize = value.toIntOrDefault(maxSize)
         }
     }
 
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 0a77475..2dd8dd5 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -41,6 +41,7 @@ import net.thauvin.erik.mobibot.Utils.obfuscate
 import net.thauvin.erik.mobibot.Utils.plural
 import net.thauvin.erik.mobibot.Utils.reverseColor
 import net.thauvin.erik.mobibot.Utils.toDir
+import net.thauvin.erik.mobibot.Utils.toIntOrDefault
 import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
 import net.thauvin.erik.mobibot.Utils.toUtcDateTime
 import net.thauvin.erik.mobibot.Utils.today
@@ -57,6 +58,7 @@ import java.io.IOException
 import java.net.URL
 import java.time.LocalDateTime
 import java.util.Calendar
+import java.util.Properties
 
 /**
  * The `Utils Test` class.
@@ -102,8 +104,11 @@ class UtilsTest {
 
     @Test
     fun testGetIntProperty() {
-        assertThat(getIntProperty("10", 1)).describedAs("getIntProperty(10, 1)").isEqualTo(10)
-        assertThat(getIntProperty("a", 1)).describedAs("getIntProperty(a, 1)").isEqualTo(1)
+        val p = Properties()
+        p["one"] = "1"
+        p["two"] = "foo"
+        assertThat(p.getIntProperty("one", 1)).describedAs("getIntProperty(one)").isEqualTo(1)
+        assertThat(p.getIntProperty("two", 2)).describedAs("getIntProperty(two)").isEqualTo(2)
     }
 
     @Test
@@ -151,6 +156,12 @@ class UtilsTest {
             .isEqualTo("https://erik.thauvin.net/")
     }
 
+    @Test
+    fun testToIntOrDefault() {
+        assertThat("10".toIntOrDefault(1)).describedAs("toIntOrDefault(10, 1)").isEqualTo(10)
+        assertThat("a".toIntOrDefault(2)).describedAs("toIntOrDefault(a, 2)").isEqualTo(2)
+    }
+
     @Test
     fun testUnescapeXml() {
         assertThat(unescapeXml("&lt;a name=&quot;test &amp; &apos;&#39;&quot;&gt;")).isEqualTo(
diff --git a/version.properties b/version.properties
index 5c5888f..a15c017 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri May 14 21:44:23 PDT 2021
-version.buildmeta=787
+#Sat May 15 01:24:55 PDT 2021
+version.buildmeta=791
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+787
+version.semver=0.8.0-beta+791

From 81cee7b00f7264f11cd20078c5392ce3df400ef5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 15 May 2021 12:01:00 -0700
Subject: [PATCH 163/262] Truncate UTC timestamp to seconds.

---
 .../net/thauvin/erik/mobibot/PinboardUtils.kt | 29 ++++++++++---------
 .../thauvin/erik/mobibot/PinboardUtilsTest.kt | 17 ++++++++---
 version.properties                            |  6 ++--
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
index 8c388f9..c4d3a5f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -39,6 +39,7 @@ import net.thauvin.erik.pinboard.PinboardPoster
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
+import java.time.temporal.ChronoUnit
 import java.util.Date
 
 /**
@@ -50,16 +51,15 @@ object PinboardUtils {
      */
     @JvmStatic
     fun addPin(poster: PinboardPoster, ircServer: String, entry: EntryLink) = runBlocking {
-        val add = async {
+        async {
             poster.addPin(
                 entry.link,
                 entry.title,
                 postedBy(entry, ircServer),
                 entry.pinboardTags,
-                formatDate(entry.date)
+                entry.date.toTimestamp()
             )
-        }
-        add.await()
+        }.await()
     }
 
     /**
@@ -67,10 +67,9 @@ object PinboardUtils {
      */
     @JvmStatic
     fun deletePin(poster: PinboardPoster, entry: EntryLink) = runBlocking {
-        val delete = async {
+        async {
             poster.deletePin(entry.link)
-        }
-        delete.await()
+        }.await()
     }
 
     /**
@@ -78,7 +77,7 @@ object PinboardUtils {
      */
     @JvmStatic
     fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) = runBlocking {
-        val update = async {
+        async {
             with(entry) {
                 if (oldUrl != link) {
                     poster.deletePin(oldUrl)
@@ -87,7 +86,7 @@ object PinboardUtils {
                         title,
                         postedBy(entry, ircServer),
                         pinboardTags,
-                        formatDate(date)
+                        date.toTimestamp()
                     )
                 } else {
                     poster.addPin(
@@ -95,21 +94,23 @@ object PinboardUtils {
                         title,
                         postedBy(entry, ircServer),
                         pinboardTags,
-                        formatDate(date),
+                        date.toTimestamp(),
                         replace = true,
                         shared = true
                     )
                 }
             }
-        }
-        update.await()
+        }.await()
     }
 
     /**
      * Format a date to a UTC timestamp.
      */
-    private fun formatDate(date: Date): String {
-        return ZonedDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()).format(DateTimeFormatter.ISO_INSTANT)
+    @JvmStatic
+    fun Date.toTimestamp(): String {
+        return ZonedDateTime.ofInstant(
+                this.toInstant().truncatedTo(ChronoUnit.SECONDS),
+                ZoneId.systemDefault()).format(DateTimeFormatter.ISO_INSTANT)
     }
 
     /**
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index d6bb8f4..dd698e4 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -33,9 +33,12 @@
 package net.thauvin.erik.mobibot
 
 import net.thauvin.erik.mobibot.entries.EntryLink
+import net.thauvin.erik.mobibot.PinboardUtils.toTimestamp
 import net.thauvin.erik.pinboard.PinboardPoster
-import org.testng.Assert
+import org.testng.Assert.assertFalse
+import org.testng.Assert.assertTrue
 import org.testng.annotations.Test
+import java.util.Date
 import java.net.URL
 
 class PinboardUtilsTest : LocalProperties() {
@@ -48,14 +51,20 @@ class PinboardUtilsTest : LocalProperties() {
         val entry = EntryLink(url, "Test Example", "ErikT", "", "#mobitopia", listOf("test"))
 
         PinboardUtils.addPin(pinboard, ircServer, entry)
-        Assert.assertTrue(validatePin(apiToken, ircServer, entry.link), "addPin")
+        assertTrue(validatePin(apiToken, ircServer, entry.link), "addPin")
         entry.link = "https://www.foo.com/"
 
         PinboardUtils.updatePin(pinboard, ircServer, url, entry)
-        Assert.assertTrue(validatePin(apiToken, ircServer, entry.link), "updatePin")
+        assertTrue(validatePin(apiToken, ircServer, entry.link), "updatePin")
 
         PinboardUtils.deletePin(pinboard, entry)
-        Assert.assertFalse(validatePin(apiToken, url = entry.link), "deletePin")
+        assertFalse(validatePin(apiToken, url = entry.link), "deletePin")
+    }
+
+    @Test
+    fun toTimestampTest() {
+        val d = Date()
+        assertTrue(d.toTimestamp().matches("[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z".toRegex()))
     }
 
     private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean {
diff --git a/version.properties b/version.properties
index a15c017..b7bbbbd 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat May 15 01:24:55 PDT 2021
-version.buildmeta=791
+#Sat May 15 12:48:51 PDT 2021
+version.buildmeta=803
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+791
+version.semver=0.8.0-beta+803

From 8681dea66f47f2d9c0a52d411c4a9ab09b0c857e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 16 May 2021 07:58:06 -0700
Subject: [PATCH 164/262] Updated to Gradle 7.0.1

---
 build.gradle                             | 6 +++---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 871deaa..7bff7c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.38.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.17.0-RC1'
+    id 'io.gitlab.arturbosch.detekt' version '1.17.0'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
@@ -38,7 +38,7 @@ dependencies {
     compileOnly 'pircbot:pircbot:1.5.0:sources'
 
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-RC'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
 
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
@@ -112,7 +112,7 @@ pmd {
 }
 
 detekt {
-    toolVersion = "main-SNAPSHOT"
+    //toolVersion = "main-SNAPSHOT"
     baseline = file("${projectDir}/config/detekt/baseline.xml")
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e5338d3..0f80bbf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 082b430ee2a64305b74cdfdd7bdab09ae413094e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 16 May 2021 08:17:16 -0700
Subject: [PATCH 165/262] Cleanup.

---
 .idea/checkstyle-idea.xml                     |  16 -
 .idea/codeStyles/Project.xml                  | 344 ------------------
 .idea/inspectionProfiles/Project_Default.xml  |  36 --
 .../inspectionProfiles/profiles_settings.xml  |   7 -
 .idea/jarRepositories.xml                     |  21 +-
 .idea/misc.xml                                |   6 -
 .idea/modules/mobibot.iml                     |  56 ---
 .idea/vcs.xml                                 |   2 +-
 .../net/thauvin/erik/mobibot/modules/War.java |   8 +-
 .../net/thauvin/erik/mobibot/FeedReader.kt    |   4 +-
 .../net/thauvin/erik/mobibot/PinboardUtils.kt |  30 +-
 .../thauvin/erik/mobibot/commands/Recap.kt    |   4 +-
 .../thauvin/erik/mobibot/commands/Versions.kt |   2 +-
 .../erik/mobibot/entries/EntriesMgr.kt        |   7 +-
 .../erik/mobibot/entries/EntryComment.kt      |   4 +-
 .../thauvin/erik/mobibot/entries/EntryLink.kt |   6 +-
 .../erik/mobibot/modules/CurrencyConverter.kt |  11 +-
 .../net/thauvin/erik/mobibot/modules/Dice.kt  |   4 +-
 .../erik/mobibot/modules/GoogleSearch.kt      |   2 +-
 .../thauvin/erik/mobibot/modules/Lookup.kt    |   4 +-
 .../erik/mobibot/modules/RockPaperScissors.kt |   2 +-
 .../erik/mobibot/modules/StockQuote.kt        |  19 +-
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  10 +-
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  17 +-
 .../thauvin/erik/mobibot/PinboardUtilsTest.kt |   6 +-
 25 files changed, 68 insertions(+), 560 deletions(-)
 delete mode 100644 .idea/checkstyle-idea.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea/modules/mobibot.iml

diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
deleted file mode 100644
index 21a0f73..0000000
--- a/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <entry key="checkstyle-version" value="8.29" />
-        <entry key="copy-libs" value="true" />
-        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
-        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
-        <entry key="scan-before-checkin" value="false" />
-        <entry key="scanscope" value="JavaOnly" />
-        <entry key="suppress-errors" value="false" />
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 321b376..e310056 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,18 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <JavaCodeStyleSettings>
-      <option name="ANNOTATION_PARAMETER_WRAP" value="2" />
-      <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
-      <option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value>
-          <package name="java.awt" withSubpackages="false" static="false" />
-        </value>
-      </option>
-      <option name="JD_INDENT_ON_CONTINUATION" value="true" />
-    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value />
@@ -21,335 +8,7 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <codeStyleSettings language="JAVA">
-      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
-      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
-      <option name="LINE_COMMENT_ADD_SPACE" value="true" />
-      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
-      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-      <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
-      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-      <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
-      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
-      <option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
-      <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
-      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
-      <option name="CALL_PARAMETERS_WRAP" value="5" />
-      <option name="METHOD_PARAMETERS_WRAP" value="5" />
-      <option name="RESOURCE_LIST_WRAP" value="1" />
-      <option name="EXTENDS_LIST_WRAP" value="1" />
-      <option name="THROWS_LIST_WRAP" value="1" />
-      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-      <option name="THROWS_KEYWORD_WRAP" value="1" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-      <option name="BINARY_OPERATION_WRAP" value="1" />
-      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-      <option name="TERNARY_OPERATION_WRAP" value="1" />
-      <option name="FOR_STATEMENT_WRAP" value="1" />
-      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-      <option name="ASSIGNMENT_WRAP" value="1" />
-      <option name="ASSERT_STATEMENT_WRAP" value="1" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <option name="DOWHILE_BRACE_FORCE" value="1" />
-      <option name="WHILE_BRACE_FORCE" value="1" />
-      <option name="FOR_BRACE_FORCE" value="1" />
-      <option name="WRAP_LONG_LINES" value="true" />
-      <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
-      <option name="ENUM_CONSTANTS_WRAP" value="1" />
-      <indentOptions>
-        <option name="USE_RELATIVE_INDENTS" value="true" />
-      </indentOptions>
-      <arrangement>
-        <groups>
-          <group>
-            <type>OVERRIDDEN_METHODS</type>
-            <order>BY_NAME</order>
-          </group>
-        </groups>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <FINAL>true</FINAL>
-                  <PUBLIC>true</PUBLIC>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <FINAL>true</FINAL>
-                  <PROTECTED>true</PROTECTED>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <FINAL>true</FINAL>
-                  <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <FINAL>true</FINAL>
-                  <PRIVATE>true</PRIVATE>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <PUBLIC>true</PUBLIC>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <PROTECTED>true</PROTECTED>
-                  <STATIC>true</STATIC>
-                  <visibility />
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <PRIVATE>true</PRIVATE>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <FINAL>true</FINAL>
-                  <PUBLIC>true</PUBLIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <FINAL>true</FINAL>
-                  <PROTECTED>true</PROTECTED>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <FINAL>true</FINAL>
-                  <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <FINAL>true</FINAL>
-                  <PRIVATE>true</PRIVATE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <PUBLIC>true</PUBLIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <PROTECTED>true</PROTECTED>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <FIELD>true</FIELD>
-                  <PRIVATE>true</PRIVATE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <FIELD>true</FIELD>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <CONSTRUCTOR>true</CONSTRUCTOR>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <METHOD>true</METHOD>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <METHOD>true</METHOD>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <ENUM>true</ENUM>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <INTERFACE>true</INTERFACE>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <CLASS>true</CLASS>
-                  <STATIC>true</STATIC>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <CLASS>true</CLASS>
-              </match>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
-      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
-      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
       <option name="CALL_PARAMETERS_WRAP" value="5" />
       <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
       <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
@@ -359,9 +18,6 @@
       <option name="EXTENDS_LIST_WRAP" value="1" />
       <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
       <option name="ASSIGNMENT_WRAP" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
     </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 838047c..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="TOP_LEVEL_CLASS_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="INNER_CLASS_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="METHOD_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
-        </value>
-      </option>
-      <option name="FIELD_OPTIONS">
-        <value>
-          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
-          <option name="REQUIRED_TAGS" value="" />
-        </value>
-      </option>
-      <option name="IGNORE_DEPRECATED" value="false" />
-      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
-      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
-      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
-      <option name="myAdditionalJavadocTags" value="created" />
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index dc2dcae..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Erik's Default" />
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a3c8d4d..39b5ad2 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -11,30 +11,15 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenLocal" />
-      <option name="name" value="MavenLocal" />
-      <option name="url" value="file:/$MAVEN_REPOSITORY$/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="MavenLocal" />
       <option name="name" value="MavenLocal" />
       <option name="url" value="file:$MAVEN_REPOSITORY$" />
     </remote-repository>
     <remote-repository>
-      <option name="id" value="MavenLocal" />
-      <option name="name" value="MavenLocal" />
-      <option name="url" value="file:$MAVEN_REPOSITORY$/" />
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="maven" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fb38c4a..0474152 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="15" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/modules/mobibot.iml b/.idea/modules/mobibot.iml
deleted file mode 100644
index 9de0d06..0000000
--- a/.idea/modules/mobibot.iml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.7.3-beta+547" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/../../out/production/classes" />
-    <output-test url="file://$MODULE_DIR$/../../out/test/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/generated/java" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../build" />
-      <excludeFolder url="file://$MODULE_DIR$/../../kobaltBuild" />
-      <excludeFolder url="file://$MODULE_DIR$/../../out" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: pircbot:pircbot:1.5.0:sources" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.12.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-slf4j-impl:2.12.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.12.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.9" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-net:commons-net:3.6" level="project" />
-    <orderEntry type="library" name="Gradle: net.thauvin.erik:pinboard-poster:1.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.aksingh:owm-japis:2.5.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:4.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome:1.12.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20190722" level="project" />
-    <orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.12.1" level="project" />
-    <orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.8" level="project" />
-    <orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: net.thauvin.erik:semver:1.2.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spotbugs:spotbugs-annotations:4.0.0-beta4" level="project" />
-    <orderEntry type="library" name="Gradle: com.rometools:rome-utils:1.12.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.2.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.50" level="project" />
-    <orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.spullara.mustache.java:compiler:0.9.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.testng:testng:7.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.assertj:assertj-core:3.13.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.beust:jcommander:1.72" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index ddd56a2..32cf9e6 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -53,9 +53,9 @@ public final class War extends AbstractModule {
     private static final String WAR_CMD = "war";
     // Deck of card
     private static final String[] WAR_DECK =
-            new String[]{ "Ace", "King", "Queen", "Jack", "10", "9", "8", "7", "6", "5", "4", "3", "2" };
+            new String[]{"Ace", "King", "Queen", "Jack", "10", "9", "8", "7", "6", "5", "4", "3", "2"};
     // Suits for the deck of card
-    private static final String[] WAR_SUITS = new String[]{ "Hearts", "Spades", "Diamonds", "Clubs" };
+    private static final String[] WAR_SUITS = new String[]{"Hearts", "Spades", "Diamonds", "Clubs"};
 
     /**
      * The default constructor.
@@ -85,9 +85,9 @@ public final class War extends AbstractModule {
             y = RANDOM.nextInt(WAR_DECK.length);
 
             getBot().send(sender + " drew the " + bold(WAR_DECK[i]) + " of "
-                          + bold(WAR_SUITS[RANDOM.nextInt(WAR_SUITS.length)]));
+                    + bold(WAR_SUITS[RANDOM.nextInt(WAR_SUITS.length)]));
             getBot().action("drew the " + bold(WAR_DECK[y]) + " of "
-                            + bold(WAR_SUITS[RANDOM.nextInt(WAR_SUITS.length)]));
+                    + bold(WAR_SUITS[RANDOM.nextInt(WAR_SUITS.length)]));
 
             if (i != y) {
                 break;
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index 4e20d32..465f603 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -33,6 +33,8 @@ package net.thauvin.erik.mobibot
 
 import com.rometools.rome.io.SyndFeedInput
 import com.rometools.rome.io.XmlReader
+import net.thauvin.erik.mobibot.Utils.green
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import java.net.MalformedURLException
 import java.net.URL
 
@@ -67,7 +69,7 @@ class FeedReader(
                         var i = 0
                         while (i < items.size && i < maxItems) {
                             send(sender, items[i].title, false)
-                            send(sender, Utils.helpFormat(Utils.green(items[i].link), false), false)
+                            send(sender, helpFormat(green(items[i].link), false), false)
                             i++
                         }
                     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
index c4d3a5f..019d152 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -32,8 +32,9 @@
 
 package net.thauvin.erik.mobibot
 
-import kotlinx.coroutines.async
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import net.thauvin.erik.mobibot.entries.EntryLink
 import net.thauvin.erik.pinboard.PinboardPoster
 import java.time.ZoneId
@@ -51,15 +52,15 @@ object PinboardUtils {
      */
     @JvmStatic
     fun addPin(poster: PinboardPoster, ircServer: String, entry: EntryLink) = runBlocking {
-        async {
+        withContext(Dispatchers.Default) {
             poster.addPin(
                 entry.link,
                 entry.title,
-                postedBy(entry, ircServer),
+                entry.postedBy(ircServer),
                 entry.pinboardTags,
                 entry.date.toTimestamp()
             )
-        }.await()
+        }
     }
 
     /**
@@ -67,9 +68,9 @@ object PinboardUtils {
      */
     @JvmStatic
     fun deletePin(poster: PinboardPoster, entry: EntryLink) = runBlocking {
-        async {
+        withContext(Dispatchers.Default) {
             poster.deletePin(entry.link)
-        }.await()
+        }
     }
 
     /**
@@ -77,14 +78,14 @@ object PinboardUtils {
      */
     @JvmStatic
     fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) = runBlocking {
-        async {
+        withContext(Dispatchers.Default) {
             with(entry) {
                 if (oldUrl != link) {
                     poster.deletePin(oldUrl)
                     poster.addPin(
                         link,
                         title,
-                        postedBy(entry, ircServer),
+                        entry.postedBy(ircServer),
                         pinboardTags,
                         date.toTimestamp()
                     )
@@ -92,7 +93,7 @@ object PinboardUtils {
                     poster.addPin(
                         link,
                         title,
-                        postedBy(entry, ircServer),
+                        entry.postedBy(ircServer),
                         pinboardTags,
                         date.toTimestamp(),
                         replace = true,
@@ -100,7 +101,7 @@ object PinboardUtils {
                     )
                 }
             }
-        }.await()
+        }
     }
 
     /**
@@ -109,15 +110,16 @@ object PinboardUtils {
     @JvmStatic
     fun Date.toTimestamp(): String {
         return ZonedDateTime.ofInstant(
-                this.toInstant().truncatedTo(ChronoUnit.SECONDS),
-                ZoneId.systemDefault()).format(DateTimeFormatter.ISO_INSTANT)
+            this.toInstant().truncatedTo(ChronoUnit.SECONDS),
+            ZoneId.systemDefault()
+        ).format(DateTimeFormatter.ISO_INSTANT)
     }
 
     /**
      * Returns the pinboard.in extended attribution line.
      */
-    private fun postedBy(entry: EntryLink, ircServer: String): String {
-        return "Posted by ${entry.nick} on ${entry.channel} ( $ircServer )"
+    private fun EntryLink.postedBy(ircServer: String): String {
+        return "Posted by ${this.nick} on ${this.channel} ( $ircServer )"
     }
 }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
index 2f21dc6..5912ff4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -59,11 +59,11 @@ class Recap(bot: Mobibot) : AbstractCommand(bot) {
         fun storeRecap(sender: String, message: String, isAction: Boolean) {
             recaps.add(
                 LocalDateTime.now(Clock.systemUTC()).toUtcDateTime()
-                    + " - $sender" + (if (isAction) " " else ": ") + message
+                        + " - $sender" + (if (isAction) " " else ": ") + message
             )
             @Suppress("MagicNumber")
             if (recaps.size > 10) {
-                recaps.removeAt(0)
+                recaps.removeFirst()
             }
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
index c20d77e..72acc6b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
@@ -40,7 +40,7 @@ class Versions(bot: Mobibot) : AbstractCommand(bot) {
     private val allVersions = listOf(
         "Version:  ${ReleaseInfo.VERSION} (${ReleaseInfo.BUILDDATE.toIsoLocalDate()})",
         "Platform: " + System.getProperty("os.name") + ' ' + System.getProperty("os.version")
-            + " (" + System.getProperty("os.arch") + ')',
+                + " (" + System.getProperty("os.arch") + ')',
         "Runtime:  " + System.getProperty("java.runtime.name") + ' ' + System.getProperty("java.runtime.version")
     )
     override val name = "versions"
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index ca74eae..0b68da8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -80,7 +80,7 @@ object EntriesMgr {
             if (!history.contains(bot.today)) {
                 history.add(bot.today)
                 while (history.size > maxBacklogs) {
-                    history.removeAt(0)
+                    history.removeFirst()
                 }
             }
             OutputStreamWriter(
@@ -201,7 +201,6 @@ object EntriesMgr {
                         language = "en"
                     }
                     val buff: StringBuilder = StringBuilder()
-                    var comment: EntryComment
                     for (i in entries.size - 1 downTo 0) {
                         with(entries[i]) {
                             buff.setLength(0)
@@ -215,13 +214,11 @@ object EntriesMgr {
                                 .append("</b></a>")
                             if (comments.size > 0) {
                                 buff.append(" <br/><br/>")
-                                val comments = comments
                                 for (j in comments.indices) {
-                                    comment = comments[j]
                                     if (j > 0) {
                                         buff.append(" <br/>")
                                     }
-                                    buff.append(comment.nick).append(": ").append(comment.comment)
+                                    buff.append(comments[j].nick).append(": ").append(comments[j].comment)
                                 }
                             }
                             item = SyndEntryImpl()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt
index c1c4416..be442d5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt
@@ -43,9 +43,7 @@ data class EntryComment(var comment: String, var nick: String) : Serializable {
      */
     val date: LocalDateTime = LocalDateTime.now()
 
-    override fun toString(): String {
-        return ("EntryComment{comment='$comment', date=$date, nick='$nick'}")
-    }
+    override fun toString(): String = "EntryComment{comment='$comment', date=$date, nick='$nick'}"
 
     companion object {
         // Serial version UID
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
index 09f22a7..b87f777 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -145,8 +145,8 @@ class EntryLink : Serializable {
      */
     fun matches(match: String?): Boolean {
         return (StringUtils.containsIgnoreCase(link, match)
-            || StringUtils.containsIgnoreCase(title, match)
-            || StringUtils.containsIgnoreCase(nick, match))
+                || StringUtils.containsIgnoreCase(title, match)
+                || StringUtils.containsIgnoreCase(nick, match))
     }
 
     /**
@@ -203,7 +203,7 @@ class EntryLink : Serializable {
      */
     override fun toString(): String {
         return ("EntryLink{channel='$channel', comments=$comments, date=$date, link='$link', login='$login'," +
-            "nick='$nick', tags=$tags, title='$title'}")
+                "nick='$nick', tags=$tags, title='$title'}")
     }
 
     companion object {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index fc5decf..b714e9a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -152,6 +152,9 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         // Last exchange rates table publication date
         private var pubDate = ""
 
+        private fun Double.formatCurrency(): String =
+            NumberFormat.getCurrencyInstance(Constants.LOCALE).format(this).substring(1)
+
         /**
          * Converts from a currency to another.
          */
@@ -171,11 +174,8 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                             val doubleFrom = EXCHANGE_RATES[to]!!.toDouble()
                             val doubleTo = EXCHANGE_RATES[from]!!.toDouble()
                             PublicMessage(
-                                NumberFormat.getCurrencyInstance(Constants.LOCALE).format(amt).substring(1)
-                                    + " ${cmds[1].uppercase()} = "
-                                    + NumberFormat.getCurrencyInstance(Constants.LOCALE)
-                                    .format(amt * doubleTo / doubleFrom).substring(1)
-                                    + " ${cmds[3].uppercase()}"
+                                amt.formatCurrency() + " ${cmds[1].uppercase()} = "
+                                        + (amt * doubleTo / doubleFrom).formatCurrency() + " ${cmds[3].uppercase()}"
                             )
                         } catch (e: NumberFormatException) {
                             ErrorMessage("Let's try with some real numbers next time, okay?")
@@ -187,6 +187,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
             } else ErrorMessage("Invalid query. Let's try again.")
         }
 
+
         @JvmStatic
         fun currencyRates(): List<String> {
             val rates = mutableListOf<String>()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 8d1afc3..46f788c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -54,12 +54,12 @@ class Dice(bot: Mobibot) : AbstractModule(bot) {
             send(
                 channel,
                 "$sender rolled two dice: ${bold(playerRoll.first)} and ${bold(playerRoll.second)}"
-                    + " for a total of ${bold(playerTotal)}",
+                        + " for a total of ${bold(playerTotal)}",
                 isPrivate
             )
             action(
                 "rolled two dice: ${bold(roll.first)} and ${bold(roll.second)}" +
-                    " for a total of ${bold(total)}"
+                        " for a total of ${bold(total)}"
             )
             when (winLoseOrTie(total, playerTotal)) {
                 Result.WIN -> action("wins.")
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index 8184881..5c1a268 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -97,7 +97,7 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
                 try {
                     val url = URL(
                         "https://www.googleapis.com/customsearch/v1?key=$apiKey&cx=$cseKey" +
-                            "&q=${encodeUrl(query)}&filter=1&num=5&alt=json"
+                                "&q=${encodeUrl(query)}&filter=1&num=5&alt=json"
                     )
                     val json = JSONObject(urlReader(url))
                     val ja = json.getJSONArray("items")
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
index 8c50d09..e1557d9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -58,8 +58,8 @@ class Lookup(bot: Mobibot) : AbstractModule(bot) {
                 } catch (ignore: UnknownHostException) {
                     if (args.matches(
                             ("(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
-                                "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
-                                "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)").toRegex()
+                                    "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
+                                    "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)").toRegex()
                         )
                     ) {
                         try {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 6f7528b..bfcbe23 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -56,7 +56,7 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
             add(
                 helpFormat(
                     "%c ${Hands.ROCK.name.lowercase()} | ${Hands.PAPER.name.lowercase()}"
-                        + " | ${Hands.SCISSORS.name.lowercase()}"
+                            + " | ${Hands.SCISSORS.name.lowercase()}"
                 )
             )
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 4b4bec1..51f49e3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -139,7 +139,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                         response = urlReader(
                             URL(
                                 "${ALPHAVANTAGE_URL}SYMBOL_SEARCH&keywords=" + encodeUrl(symbol)
-                                    + "&apikey=" + encodeUrl(apiKey)
+                                        + "&apikey=" + encodeUrl(apiKey)
                             )
                         )
                         var json = getJsonResponse(response, debugMessage)
@@ -153,8 +153,8 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                             response = urlReader(
                                 URL(
                                     "${ALPHAVANTAGE_URL}GLOBAL_QUOTE&symbol="
-                                        + encodeUrl(symbolInfo.getString("1. symbol"))
-                                        + "&apikey=" + encodeUrl(apiKey)
+                                            + encodeUrl(symbolInfo.getString("1. symbol"))
+                                            + "&apikey=" + encodeUrl(apiKey)
                                 )
                             )
                             json = getJsonResponse(response, debugMessage)
@@ -166,28 +166,23 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                             add(
                                 PublicMessage(
                                     "Symbol: " + unescapeXml(quote.getString("01. symbol"))
-                                        + " [" + unescapeXml(symbolInfo.getString("2. name")) + ']'
+                                            + " [" + unescapeXml(symbolInfo.getString("2. name")) + ']'
                                 )
                             )
                             add(PublicMessage("    Price:     " + unescapeXml(quote.getString("05. price"))))
-                            add(
-                                PublicMessage(
-                                    "    Previous:  " + unescapeXml(quote.getString("08. previous close"))
-                                )
-                            )
+                            add(PublicMessage("    Previous:  " + unescapeXml(quote.getString("08. previous close"))))
                             add(NoticeMessage("    Open:      " + unescapeXml(quote.getString("02. open"))))
                             add(NoticeMessage("    High:      " + unescapeXml(quote.getString("03. high"))))
                             add(NoticeMessage("    Low:       " + unescapeXml(quote.getString("04. low"))))
                             add(NoticeMessage("    Volume:    " + unescapeXml(quote.getString("06. volume"))))
-                            add(
-                                NoticeMessage(
+                            add(NoticeMessage(
                                     "    Latest:    " + unescapeXml(quote.getString("07. latest trading day"))
                                 )
                             )
                             add(
                                 NoticeMessage(
                                     "    Change:    " + unescapeXml(quote.getString("09. change")) + " ["
-                                        + unescapeXml(quote.getString("10. change percent")) + ']'
+                                            + unescapeXml(quote.getString("10. change percent")) + ']'
                                 )
                             )
                         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index 238952b..b1f7d3e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -104,9 +104,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
         @Throws(ModuleException::class)
         fun getWeather(query: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
-                throw ModuleException(
-                    "${WEATHER_CMD.capitalise()} is disabled. The API key is missing."
-                )
+                throw ModuleException("${WEATHER_CMD.capitalise()} is disabled. The API key is missing.")
             }
             val owm = OWM(apiKey)
             val messages = mutableListOf<Message>()
@@ -127,9 +125,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                             owm.currentWeatherByCityName(city, getCountry(country))
                         }
                         if (cwd.hasCityName()) {
-                            messages.add(
-                                PublicMessage("City: ${cwd.cityName} [${country.uppercase()}]")
-                            )
+                            messages.add(PublicMessage("City: ${cwd.cityName} [${country.uppercase()}]"))
                             with(cwd.mainData) {
                                 if (this != null) {
                                     if (hasTemp()) {
@@ -170,7 +166,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                                     messages.add(
                                         NoticeMessage(
                                             "https://openweathermap.org/find?q="
-                                                + encodeUrl("$city,${country.uppercase()}"),
+                                                    + encodeUrl("$city,${country.uppercase()}"),
                                             Colors.GREEN
                                         )
                                     )
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 7c769e9..0837590 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -58,6 +58,10 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         // The Time command
         private const val TIME_CMD = "time"
 
+        // Date/Time Format
+        private var dtf =
+            DateTimeFormatter.ofPattern("'The time is ${bold("'HH:mm'")} on ${bold("'EEEE, d MMMM yyyy'")} in '")
+
         /**
          * Returns the current Internet (beat) Time.
          */
@@ -65,7 +69,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         private fun internetTime(): String {
             val zdt = ZonedDateTime.now(ZoneId.of("UTC+01:00"))
             val beats = ((zdt[ChronoField.SECOND_OF_MINUTE] + zdt[ChronoField.MINUTE_OF_HOUR] * 60
-                + zdt[ChronoField.HOUR_OF_DAY] * 3600) / 86.4).toInt()
+                    + zdt[ChronoField.HOUR_OF_DAY] * 3600) / 86.4).toInt()
             return String.format(Locale.getDefault(), "%c%03d", '@', beats)
         }
 
@@ -79,15 +83,8 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
                 if (BEATS_KEYWORD == tz) {
                     "The current Internet Time is: ${bold(internetTime())} $BEATS_KEYWORD"
                 } else {
-                    (ZonedDateTime.now()
-                        .withZoneSameInstant(ZoneId.of(tz))
-                        .format(
-                            DateTimeFormatter.ofPattern(
-                                "'The time is ${bold("'HH:mm'")} on ${bold("'EEEE, d MMMM yyyy'")} in '"
-                            )
-                        )
-                        + bold(tz.substring(tz.indexOf('/') + 1).replace('_', ' '))
-                        )
+                    (ZonedDateTime.now().withZoneSameInstant(ZoneId.of(tz)).format(dtf)
+                            + bold(tz.substring(tz.indexOf('/') + 1).replace('_', ' ')))
                 }
             } else {
                 return ErrorMessage("Unsupported country/zone. Please try again.")
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index dd698e4..7fcd726 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -32,14 +32,14 @@
 
 package net.thauvin.erik.mobibot
 
-import net.thauvin.erik.mobibot.entries.EntryLink
 import net.thauvin.erik.mobibot.PinboardUtils.toTimestamp
+import net.thauvin.erik.mobibot.entries.EntryLink
 import net.thauvin.erik.pinboard.PinboardPoster
 import org.testng.Assert.assertFalse
 import org.testng.Assert.assertTrue
 import org.testng.annotations.Test
-import java.util.Date
 import java.net.URL
+import java.util.Date
 
 class PinboardUtilsTest : LocalProperties() {
     @Test
@@ -71,7 +71,7 @@ class PinboardUtilsTest : LocalProperties() {
         val response = Utils.urlReader(
             URL(
                 "https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
-                    + Utils.encodeUrl(url)
+                        + Utils.encodeUrl(url)
             )
         )
 

From 484f11664e0d22872b4a93fcec3a2d07bf5b5bb3 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 18 May 2021 22:12:07 -0700
Subject: [PATCH 166/262] Added FeedReader tests.

---
 .../net/thauvin/erik/mobibot/FeedReader.kt    | 57 +++++++++------
 .../thauvin/erik/mobibot/FeedReaderTest.kt    | 73 +++++++++++++++++++
 2 files changed, 106 insertions(+), 24 deletions(-)
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index 465f603..9cb929b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -31,11 +31,14 @@
  */
 package net.thauvin.erik.mobibot
 
+import com.rometools.rome.io.FeedException
 import com.rometools.rome.io.SyndFeedInput
 import com.rometools.rome.io.XmlReader
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.PublicMessage
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import java.net.MalformedURLException
+import java.io.IOException
 import java.net.URL
 
 /**
@@ -49,38 +52,44 @@ class FeedReader(
     // URL to fetch
     private val url: String
 ) : Runnable {
-    // Maximum number of feed items to display
-    @Suppress("MagicNumber")
-    private val maxItems = 5
-
     /**
      * Fetches the Feed's items.
      */
     override fun run() {
         with(bot) {
             try {
-                val input = SyndFeedInput()
-                XmlReader(URL(url)).use { reader ->
-                    val feed = input.build(reader)
-                    val items = feed.entries
-                    if (items.isEmpty()) {
-                        send(sender, "There is currently nothing to view.", false)
-                    } else {
-                        var i = 0
-                        while (i < items.size && i < maxItems) {
-                            send(sender, items[i].title, false)
-                            send(sender, helpFormat(green(items[i].link), false), false)
-                            i++
-                        }
-                    }
+                readFeed(url).forEach {
+                    send(sender, it)
                 }
-            } catch (e: MalformedURLException) {
-                if (logger.isDebugEnabled) logger.debug("Invalid feed URL.", e)
-                send(sender, "The feed URL is invalid.", false)
-            } catch (e: Exception) {
-                if (logger.isDebugEnabled) logger.debug("Unable to fetch the feed.", e)
+            } catch (e: FeedException) {
+                if (logger.isDebugEnabled) logger.debug("Unabled to parse the feed at ${url}", e)
+                send(sender, "An error has occured while parsing the feed: ${e.message}", false)
+            } catch (e: IOException) {
+                if (logger.isDebugEnabled) logger.debug("Unable to fetch the feed at ${url}", e)
                 send(sender, "An error has occurred while fetching the feed: ${e.message}", false)
             }
         }
     }
+
+    companion object {
+        @JvmStatic
+        @Throws(FeedException::class, IOException::class)
+        fun readFeed(url: String, maxItems: Int = 5) : List<Message> {
+            val messages = mutableListOf<Message>()
+            val input = SyndFeedInput()
+            XmlReader(URL(url)).use { reader ->
+                val feed = input.build(reader)
+                val items = feed.entries
+                if (items.isEmpty()) {
+                    messages.add(PublicMessage("There is currently nothing to view."))
+                } else {
+                    items.take(maxItems).forEach {
+                        messages.add(PublicMessage(it.title))
+                        messages.add(PublicMessage(helpFormat(green(it.link), false)))
+                    }
+                }
+            }
+            return messages
+        }
+    }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
new file mode 100644
index 0000000..0b2185e
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
@@ -0,0 +1,73 @@
+/*
+ * FeedReaderTest.java
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot
+
+import com.rometools.rome.io.FeedException
+import net.thauvin.erik.mobibot.FeedReader.Companion.readFeed
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatThrownBy
+import org.testng.annotations.Test
+
+import java.io.FileNotFoundException
+import java.net.MalformedURLException
+import java.net.UnknownHostException
+
+/**
+ * The `FeedReader Test` class.
+ */
+class FeedReaderTest {
+    @Test
+    fun readFeedTest() {
+        var messages = readFeed("https://feeds.thauvin.net/ethauvin")
+        assertThat(messages.size).describedAs("messages = 10").isEqualTo(10)
+        assertThat(messages[1].msg).describedAs("feed entry url").contains("ethauvin")
+
+        messages = readFeed("https://lorem-rss.herokuapp.com/feed?length=0")
+        assertThat(messages[0].msg).describedAs("nothing to view").contains("nothing")
+        
+        messages = readFeed("https://lorem-rss.herokuapp.com/feed?length=42", 42)
+        assertThat(messages.size).describedAs("messages = 84").isEqualTo(84)
+        assertThat(messages.last().msg).describedAs("example entry url").contains("http://example.com/test/")
+        
+        assertThatThrownBy { readFeed("blah") }.describedAs("invalid URL")
+            .isInstanceOf(MalformedURLException::class.java)
+
+        assertThatThrownBy { readFeed("https://www.example.com") }.describedAs("not a feed")
+            .isInstanceOf(FeedException::class.java)
+
+        assertThatThrownBy { readFeed("https://www.examples.com/foo") }.describedAs("404 not found")
+            .isInstanceOf(FileNotFoundException::class.java)
+
+        assertThatThrownBy { readFeed("https://www.doesnotexists.com") }.describedAs("unknown host")
+            .isInstanceOf(UnknownHostException::class.java)
+    }
+}

From 6644400a232206ef67ece1e8254be8cfae25953f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 18 May 2021 22:13:31 -0700
Subject: [PATCH 167/262] Added shudown() with associated Die and Kill
 commands.

---
 config/detekt/baseline.xml                    |  2 -
 .../net/thauvin/erik/mobibot/Mobibot.kt       | 23 +++++++-
 .../net/thauvin/erik/mobibot/commands/Die.kt  | 57 +++++++++++++++++++
 .../net/thauvin/erik/mobibot/commands/Kill.kt | 56 ++++++++++++++++++
 4 files changed, 135 insertions(+), 3 deletions(-)
 create mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
 create mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 07ee2ba..0b6f182 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -24,7 +24,6 @@
     <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
     <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr$// Daily backup private fun dailyBackup( bot: Mobibot, history: MutableList&lt;String&gt; )</ID>
     <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ private fun setTags(tags: List&lt;String?&gt;)</ID>
-    <ID>NestedBlockDepth:FeedReader.kt$FeedReader$ override fun run()</ID>
     <ID>NestedBlockDepth:GoogleSearch.kt$GoogleSearch$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
     <ID>NestedBlockDepth:Lookup.kt$Lookup$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
@@ -45,7 +44,6 @@
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
     <ID>ThrowsCount:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>TooGenericExceptionCaught:CryptoPrices.kt$CryptoPrices$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:FeedReader.kt$FeedReader$e: Exception</ID>
     <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$e: Exception</ID>
     <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$ex: Exception</ID>
     <ID>TooGenericExceptionCaught:StockQuote.kt$StockQuote.Companion$e: NullPointerException</ID>
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index c6390f0..0cb7100 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -45,8 +45,10 @@ import net.thauvin.erik.mobibot.commands.AddLog
 import net.thauvin.erik.mobibot.commands.ChannelFeed
 import net.thauvin.erik.mobibot.commands.Cycle
 import net.thauvin.erik.mobibot.commands.Debug
+import net.thauvin.erik.mobibot.commands.Die
 import net.thauvin.erik.mobibot.commands.Ignore
 import net.thauvin.erik.mobibot.commands.Info
+import net.thauvin.erik.mobibot.commands.Kill
 import net.thauvin.erik.mobibot.commands.Me
 import net.thauvin.erik.mobibot.commands.Modules
 import net.thauvin.erik.mobibot.commands.Msg
@@ -260,7 +262,6 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         }
     }
 
-
     /**
      * Responds with the default, commands or modules help.
      */
@@ -468,6 +469,24 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         }
     }
 
+    /**
+     * Shutdown the bot.
+     */
+    fun shutdown(sender: String, now: Boolean = false) {
+        if (now) { // kill
+            twitter.notification("$name killed by $sender on $channel")
+            sendRawLine("QUIT :Poof!")
+        } else {
+            timer.cancel()
+            twitter.shutdown()
+            twitter.notification("$name stopped by $sender on $channel")
+            @Suppress("MagicNumber")
+            sleep(3)
+            quitServer("The Bot Is Out There!")
+        }
+        exitProcess(0)
+    }
+
     /**
      * Sleeps for the specified number of seconds.
      */
@@ -654,9 +673,11 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         addons.add(AddLog(this), p)
         addons.add(ChannelFeed(this, channelName), p)
         addons.add(Cycle(this), p)
+        addons.add(Die(this), p)
         addons.add(Debug(this), p)
         addons.add(Ignore(this), p)
         addons.add(Info(this), p)
+        addons.add(Kill(this), p)
         addons.add(Me(this), p)
         addons.add(Modules(this), p)
         addons.add(Msg(this), p)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
new file mode 100644
index 0000000..eba2dcc
--- /dev/null
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
@@ -0,0 +1,57 @@
+/*
+ * Die.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.helpFormat
+
+class Die(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "die"
+    override val help = emptyList<String>()
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = false
+
+    override fun commandResponse(
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.send("$sender has just signed my death sentence.")
+            bot.shutdown(sender)
+        }
+    }
+}
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt
new file mode 100644
index 0000000..6055798
--- /dev/null
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt
@@ -0,0 +1,56 @@
+/*
+ * Kill.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.helpFormat
+
+class Kill(bot: Mobibot) : AbstractCommand(bot) {
+    override val name = "kill"
+    override val help = emptyList<String>()
+    override val isOp = true
+    override val isPublic = false
+    override val isVisible = false
+
+    override fun commandResponse(
+        sender: String,
+        login: String,
+        args: String,
+        isOp: Boolean,
+        isPrivate: Boolean
+    ) {
+        if (isOp) {
+            bot.shutdown(sender, true)
+        }
+    }
+}

From 48c2ad65c0391098c643ec2ddd816b15be1f476b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 18 May 2021 23:48:25 -0700
Subject: [PATCH 168/262] Cleanup.

---
 .../kotlin/net/thauvin/erik/mobibot/Constants.kt   |  5 +++++
 .../kotlin/net/thauvin/erik/mobibot/FeedReader.kt  | 10 +++++-----
 .../net/thauvin/erik/mobibot/commands/Die.kt       |  1 -
 .../net/thauvin/erik/mobibot/commands/Kill.kt      |  1 -
 .../thauvin/erik/mobibot/commands/links/Tags.kt    |  8 ++++----
 .../net/thauvin/erik/mobibot/commands/tell/Tell.kt | 14 +++++++-------
 .../erik/mobibot/commands/tell/TellMessage.kt      |  2 +-
 .../net/thauvin/erik/mobibot/entries/EntriesMgr.kt |  3 ++-
 .../thauvin/erik/mobibot/entries/EntriesUtils.kt   |  2 +-
 .../net/thauvin/erik/mobibot/modules/StockQuote.kt |  3 ++-
 .../net/thauvin/erik/mobibot/FeedReaderTest.kt     |  4 ++--
 11 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
index d1b33b3..4b93ac1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
@@ -102,6 +102,11 @@ object Constants {
      */
     const val PROPS_ARG = "properties"
 
+    /**
+     * The tag command
+     */
+    const val TAG_CMD = "T"
+
     /**
      * The timer delay in minutes.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index 9cb929b..884ca78 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -34,10 +34,10 @@ package net.thauvin.erik.mobibot
 import com.rometools.rome.io.FeedException
 import com.rometools.rome.io.SyndFeedInput
 import com.rometools.rome.io.XmlReader
-import net.thauvin.erik.mobibot.msg.Message
-import net.thauvin.erik.mobibot.msg.PublicMessage
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.PublicMessage
 import java.io.IOException
 import java.net.URL
 
@@ -62,10 +62,10 @@ class FeedReader(
                     send(sender, it)
                 }
             } catch (e: FeedException) {
-                if (logger.isDebugEnabled) logger.debug("Unabled to parse the feed at ${url}", e)
+                if (logger.isDebugEnabled) logger.debug("Unabled to parse the feed at $url", e)
                 send(sender, "An error has occured while parsing the feed: ${e.message}", false)
             } catch (e: IOException) {
-                if (logger.isDebugEnabled) logger.debug("Unable to fetch the feed at ${url}", e)
+                if (logger.isDebugEnabled) logger.debug("Unable to fetch the feed at $url", e)
                 send(sender, "An error has occurred while fetching the feed: ${e.message}", false)
             }
         }
@@ -74,7 +74,7 @@ class FeedReader(
     companion object {
         @JvmStatic
         @Throws(FeedException::class, IOException::class)
-        fun readFeed(url: String, maxItems: Int = 5) : List<Message> {
+        fun readFeed(url: String, maxItems: Int = 5): List<Message> {
             val messages = mutableListOf<Message>()
             val input = SyndFeedInput()
             XmlReader(URL(url)).use { reader ->
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
index eba2dcc..c9c6299 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
@@ -33,7 +33,6 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Die(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "die"
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt
index 6055798..803ab58 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt
@@ -33,7 +33,6 @@
 package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Kill(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "kill"
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
index 554d6c8..e2b6d8f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -42,8 +42,8 @@ import net.thauvin.erik.mobibot.entries.EntryLink
 class Tags(bot: Mobibot) : AbstractCommand(bot) {
     override val name = COMMAND
     override val help = listOf(
-        "To categorize or tag a URL, use its label and a T:",
-        helpFormat("${Constants.LINK_CMD}1T:<+tag|-tag> [...]")
+        "To categorize or tag a URL, use its label and a ${Constants.TAG_CMD}:",
+        helpFormat("${Constants.LINK_CMD}1${Constants.TAG_CMD}:<+tag|-tag> [...]")
     )
     override val isOp = false
     override val isPublic = true
@@ -60,7 +60,7 @@ class Tags(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        val cmds = args.substring(1).split("T:", limit = 2)
+        val cmds = args.substring(1).split("${Constants.TAG_CMD}:", limit = 2)
         val index = cmds[0].toInt() - 1
 
         if (index < LinksMgr.entries.size) {
@@ -86,6 +86,6 @@ class Tags(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     override fun matches(message: String): Boolean {
-        return message.matches("^${Constants.LINK_CMD}[0-9]+T:.*".toRegex())
+        return message.matches("^${Constants.LINK_CMD}[0-9]+${Constants.TAG_CMD}:.*".toRegex())
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index cd59eac..0792eaa 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -229,7 +229,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                         bot.send(
                             nickname,
                             "Your message ${reverseColor("[ID " + message.id + ']')} was sent to "
-                                + "${bold(message.recipient)} on ${message.receptionDate.toUtcDateTime()}",
+                                    + "${bold(message.recipient)} on ${message.receptionDate.toUtcDateTime()}",
                             true
                         )
                         message.isNotified = true
@@ -252,8 +252,8 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
             for (message in messages) {
                 bot.send(
                     sender, bold(message.sender) + ARROW + bold(message.recipient)
-                        + " [ID: " + message.id + ", "
-                        + (if (message.isReceived) "DELIVERED" else "QUEUED") + ']',
+                            + " [ID: " + message.id + ", "
+                            + (if (message.isReceived) "DELIVERED" else "QUEUED") + ']',
                     isPrivate
                 )
             }
@@ -275,16 +275,16 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                     bot.send(
                         sender,
                         bold(message.sender) + ARROW + bold(message.recipient)
-                            + " [${message.receptionDate.toUtcDateTime()}, ID: "
-                            + bold(message.id) + ", DELIVERED]",
+                                + " [${message.receptionDate.toUtcDateTime()}, ID: "
+                                + bold(message.id) + ", DELIVERED]",
                         isPrivate
                     )
                 } else {
                     bot.send(
                         sender,
                         bold(message.sender) + ARROW + bold(message.recipient)
-                            + " [${message.queued.toUtcDateTime()}, ID: "
-                            + bold(message.id) + ", QUEUED]",
+                                + " [${message.queued.toUtcDateTime()}, ID: "
+                                + bold(message.id) + ", QUEUED]",
                         isPrivate
                     )
                 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
index 396b854..6a058f6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
@@ -95,7 +95,7 @@ class TellMessage internal constructor(
 
     override fun toString(): String {
         return ("TellMessage{id='$id', isNotified=$isNotified, isReceived=$isReceived, message='$message', " +
-            "queued=$queued, received=$receptionDate, recipient='$recipient', sender='$sender'}")
+                "queued=$queued, received=$receptionDate, recipient='$recipient', sender='$sender'}")
     }
 
     companion object {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index 0b68da8..6f9ffff 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -248,7 +248,8 @@ object EntriesMgr {
             } catch (e: FeedException) {
                 if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
             } catch (e: IOException) {
-                if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
+                if (bot.logger.isWarnEnabled)
+                    bot.logger.warn("An IO error occurred while generating the entries feed.", e)
             }
         } else {
             if (bot.logger.isWarnEnabled) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index 5f83aa2..c0247c3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -76,5 +76,5 @@ object EntriesUtils {
      * Build an entry's tags/categories for display on the channel.
      */
     fun buildTags(entryIndex: Int, entry: EntryLink): String =
-        buildLinkCmd(entryIndex) + "T: " + entry.pinboardTags.replace(",", ", ")
+        buildLinkCmd(entryIndex) + "${Constants.TAG_CMD}: " + entry.pinboardTags.replace(",", ", ")
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 51f49e3..1459914 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -175,7 +175,8 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                             add(NoticeMessage("    High:      " + unescapeXml(quote.getString("03. high"))))
                             add(NoticeMessage("    Low:       " + unescapeXml(quote.getString("04. low"))))
                             add(NoticeMessage("    Volume:    " + unescapeXml(quote.getString("06. volume"))))
-                            add(NoticeMessage(
+                            add(
+                                NoticeMessage(
                                     "    Latest:    " + unescapeXml(quote.getString("07. latest trading day"))
                                 )
                             )
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
index 0b2185e..3360242 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
@@ -53,11 +53,11 @@ class FeedReaderTest {
 
         messages = readFeed("https://lorem-rss.herokuapp.com/feed?length=0")
         assertThat(messages[0].msg).describedAs("nothing to view").contains("nothing")
-        
+
         messages = readFeed("https://lorem-rss.herokuapp.com/feed?length=42", 42)
         assertThat(messages.size).describedAs("messages = 84").isEqualTo(84)
         assertThat(messages.last().msg).describedAs("example entry url").contains("http://example.com/test/")
-        
+
         assertThatThrownBy { readFeed("blah") }.describedAs("invalid URL")
             .isInstanceOf(MalformedURLException::class.java)
 

From 5b9d8911e190a6dccb5dc42189301bf4881be31d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 19 May 2021 18:24:56 -0700
Subject: [PATCH 169/262] Removed fetch on TravisCI

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 84c808c..b1a896e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,6 @@ env:
   global:
     - CI_NAME="Travis CI"
 
-install:
-  - git fetch --unshallow --tags
-
 addons:
   sonarcloud:
     organization: "ethauvin-github"

From 9270f5f8b46ded05d1af6da9397ed5aa911a35cb Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 19 May 2021 18:43:20 -0700
Subject: [PATCH 170/262] Removed Sonarcloud from TravisCI.

---
 .travis.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1a896e..19b0ad1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,19 +5,9 @@ env:
   global:
     - CI_NAME="Travis CI"
 
-addons:
-  sonarcloud:
-    organization: "ethauvin-github"
-
 jdk:
   - openjdk11
   - openjdk15
 
 before_install:
   - chmod +x gradlew
-
-after_success:
-  - |
-    if [ "${TRAVIS_TEST_RESULT}" == 0 ] && [ "$TRAVIS_JDK_VERSION" == openjdk11 ]; then
-      ./gradlew sonarqube
-    fi

From 98ed1d5042d9c6c220a3a81c645a0a0b80630953 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 19 May 2021 19:01:47 -0700
Subject: [PATCH 171/262] Added Sonarcloud to GitHub CI.

---
 .github/workflows/gradle.yml | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 2fff393..5f9e89c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -5,17 +5,29 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
           java-version: 11
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+      - name: Cache Gradle packages
+        uses: actions/cache@v1
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
       - name: Test with Gradle
-        run: ./gradlew check
         env:
           CI_NAME: "GitHub CI"
           ALPHAVANTAGE_API_KEY: ${{ secrets.ALPHAVANTAGE_API_KEY }}
@@ -23,8 +35,10 @@ jobs:
           GOOGLE_CSE_CX: ${{ secrets.GOOGLE_CSE_CX }}
           OWM_API_KEY: ${{ secrets.OWM_API_KEY }}
           PINBOARD_API_TOKEN: ${{ secrets.PINBOARD_API_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           TWITTER_CONSUMERKEY: ${{ secrets.TWITTER_CONSUMERKEY }}
           TWITTER_CONSUMERSECRET: ${{ secrets.TWITTER_CONSUMERSECRET }}
           TWITTER_HANDLE: ${{ secrets.TWITTER_HANDLE }}
           TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }}
           TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }}
+        run: ./gradlew check sonarqube

From 381887d937643f7683ae2ed8142d72e786f6e2f6 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 19 May 2021 19:13:02 -0700
Subject: [PATCH 172/262] Testing Sonarqube with GitHub CI.

---
 .github/workflows/gradle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 5f9e89c..b8ad30b 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -41,4 +41,4 @@ jobs:
           TWITTER_HANDLE: ${{ secrets.TWITTER_HANDLE }}
           TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }}
           TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }}
-        run: ./gradlew check sonarqube
+        run: ./gradlew sonarqube --info

From 30f2ef7273136a2240670e013d2a51dbabb23a36 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 19 May 2021 19:23:38 -0700
Subject: [PATCH 173/262] Added Sonarcloud URL.

---
 .github/workflows/gradle.yml | 2 +-
 build.gradle                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b8ad30b..5f9e89c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -41,4 +41,4 @@ jobs:
           TWITTER_HANDLE: ${{ secrets.TWITTER_HANDLE }}
           TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }}
           TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }}
-        run: ./gradlew sonarqube --info
+        run: ./gradlew check sonarqube
diff --git a/build.gradle b/build.gradle
index 7bff7c0..b4bed24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -145,6 +145,7 @@ incrementBuildMeta {
 sonarqube {
     properties {
         property "sonar.projectKey", "ethauvin_mobibot"
+        property "sonar.host.url", "https://sonarcloud.io"
     }
 }
 

From b8c3bf96159111a8446f2f68cb2dfa22a25edef5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 19 May 2021 19:29:34 -0700
Subject: [PATCH 174/262] Added sonar.organization property.

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index b4bed24..4d4a074 100644
--- a/build.gradle
+++ b/build.gradle
@@ -144,6 +144,7 @@ incrementBuildMeta {
 
 sonarqube {
     properties {
+        property "sonar.organization", "ethauvin-github"
         property "sonar.projectKey", "ethauvin_mobibot"
         property "sonar.host.url", "https://sonarcloud.io"
     }

From e4d3f3f2c4ae6e7f3207a66f070d8196fb573eea Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 19 May 2021 19:42:55 -0700
Subject: [PATCH 175/262] Added GitHub token env.

---
 .github/workflows/gradle.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 5f9e89c..b1bb3a7 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -31,6 +31,7 @@ jobs:
         env:
           CI_NAME: "GitHub CI"
           ALPHAVANTAGE_API_KEY: ${{ secrets.ALPHAVANTAGE_API_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
           GOOGLE_CSE_CX: ${{ secrets.GOOGLE_CSE_CX }}
           OWM_API_KEY: ${{ secrets.OWM_API_KEY }}

From d2c0e12e1a88de4a1adf9de150a0668ced4e31b8 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 19 May 2021 20:18:32 -0700
Subject: [PATCH 176/262] Added Gradle caches setup and cleanup.

---
 .github/workflows/gradle.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b1bb3a7..b11bffb 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -22,11 +22,14 @@ jobs:
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
       - name: Test with Gradle
         env:
           CI_NAME: "GitHub CI"
@@ -43,3 +46,7 @@ jobs:
           TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }}
           TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }}
         run: ./gradlew check sonarqube
+      - name: Cleanup Gradle Cache
+        run: |
+          rm -f ~/.gradle/caches/modules-2/modules-2.lock
+          rm -f ~/.gradle/caches/modules-2/gc.properties

From 1263160924f991430096dfcaeae3a0f8580b39b2 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 20 May 2021 18:09:42 -0700
Subject: [PATCH 177/262] Switched to system-wide Gradle.

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b01f79..c415a8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ stages:
 
 build:
   stage: build
-  script: ./gradlew --build-cache assemble
+  script: gradle --build-cache assemble
   cache:
     key: "$CI_COMMIT_REF_NAME"
     policy: push
@@ -23,7 +23,7 @@ build:
 
 test:
   stage: test
-  script: ./gradlew check
+  script: gradle check
   cache:
     key: "$CI_COMMIT_REF_NAME"
     policy: pull

From 43615f253cac49e5e87425ff9c4b423801c1aa6f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 20 May 2021 20:09:01 -0700
Subject: [PATCH 178/262] Removed TravisCI.

---
 .github/workflows/gradle.yml |  2 +-
 .travis.yml                  | 13 -------------
 README.md                    |  2 +-
 version.properties           |  6 +++---
 4 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b11bffb..c447ffe 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -1,4 +1,4 @@
-name: Java CI with Gradle
+name: gradle-ci
 
 on: [push, pull_request, workflow_dispatch]
 
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 19b0ad1..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: java
-dist: trusty
-
-env:
-  global:
-    - CI_NAME="Travis CI"
-
-jdk:
-  - openjdk11
-  - openjdk15
-
-before_install:
-  - chmod +x gradlew
diff --git a/README.md b/README.md
index 4b2ed1c..1a28679 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause) [![Known Vulnerabilities](https://snyk.io/test/github/ethauvin/mobibot/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/ethauvin/mobibot?targetFile=build.gradle) [![Build Status](https://travis-ci.com/ethauvin/mobibot.svg?branch=master)](https://travis-ci.com/ethauvin/mobibot) [![CircleCI](https://circleci.com/gh/ethauvin/mobibot/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/mobibot/tree/master)
+[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause) [![Known Vulnerabilities](https://snyk.io/test/github/ethauvin/mobibot/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/ethauvin/mobibot?targetFile=build.gradle) [![GitHub CI](https://github.com/ethauvin/mobibot/actions/workflows/gradle.yml/badge.svg)](https://github.com/ethauvin/mobibot/actions/workflows/gradle.yml) [![CircleCI](https://circleci.com/gh/ethauvin/mobibot/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/mobibot/tree/master)
 
 Some very basic instructions:
 
diff --git a/version.properties b/version.properties
index b7bbbbd..18e0fb1 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat May 15 12:48:51 PDT 2021
-version.buildmeta=803
+#Wed May 19 19:28:39 PDT 2021
+version.buildmeta=842
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+803
+version.semver=0.8.0-beta+842

From 05b7ca8a411ce7a962300f24b592be81224c3cd4 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 25 May 2021 16:33:17 -0700
Subject: [PATCH 179/262] Format cryptoprice as currency.

---
 build.gradle                                           |  6 +++---
 config/detekt/baseline.xml                             |  1 +
 .../net/thauvin/erik/mobibot/modules/CryptoPrices.kt   | 10 +++++++++-
 version.properties                                     |  6 +++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4d4a074..b4aed72 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,12 +3,12 @@ plugins {
     id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.38.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.17.0'
+    id 'io.gitlab.arturbosch.detekt' version '1.17.1'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.0'
-    id 'org.jetbrains.kotlin.kapt' version '1.5.0'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.10'
+    id 'org.jetbrains.kotlin.kapt' version '1.5.10'
     id 'org.sonarqube' version '3.2.0'
     id 'pmd'
 }
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 0b6f182..6b6b2e0 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -39,6 +39,7 @@
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
+    <ID>SwallowedException:CryptoPrices.kt$CryptoPrices$catch (e: IllegalArgumentException) { price.amount }</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index 4cd57c2..8f98fa7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -38,6 +38,9 @@ import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.msg.PublicMessage
 
+import java.text.NumberFormat
+import java.util.Currency
+
 /**
  * The Cryptocurrency Prices  module.
  */
@@ -51,7 +54,12 @@ class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
             if (args.matches("\\w+( [a-zA-Z]{3}+)?".toRegex())) {
                 try {
                     val price = currentPrice(args.split(' '))
-                    send(sender, PublicMessage("${price.base}: ${price.amount} [${price.currency}]"))
+                    val amount = try {
+                        price.toCurrency()
+                    } catch (e: IllegalArgumentException) {
+                        price.amount
+                    }
+                    send(sender, PublicMessage("${price.base}: $amount [${price.currency}]"))
                 } catch (e: CryptoException) {
                     if (logger.isWarnEnabled) logger.warn("$debugMessage => ${e.statusCode}", e)
                     send(e.message)
diff --git a/version.properties b/version.properties
index 18e0fb1..854ee64 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed May 19 19:28:39 PDT 2021
-version.buildmeta=842
+#Tue May 25 18:01:58 PDT 2021
+version.buildmeta=848
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+842
+version.semver=0.8.0-beta+848

From 2c1ea56e79849dbcfdb24573151f323790cec2a7 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 28 May 2021 11:29:39 -0700
Subject: [PATCH 180/262] Updated dependencies.

---
 build.gradle                                          |  2 +-
 config/detekt/baseline.xml                            |  1 -
 .../net/thauvin/erik/mobibot/modules/CryptoPrices.kt  | 11 ++++-------
 .../thauvin/erik/mobibot/modules/CryptoPricesTest.kt  |  4 ++--
 version.properties                                    |  6 +++---
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index b4aed72..9380b95 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'application'
     id 'checkstyle'
-    id 'com.github.ben-manes.versions' version '0.38.0'
+    id 'com.github.ben-manes.versions' version '0.39.0'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.17.1'
     id 'jacoco'
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 6b6b2e0..0b6f182 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -39,7 +39,6 @@
     <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
-    <ID>SwallowedException:CryptoPrices.kt$CryptoPrices$catch (e: IllegalArgumentException) { price.amount }</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index 8f98fa7..c4b2fcd 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -33,14 +33,11 @@ package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.crypto.CryptoException
 import net.thauvin.erik.crypto.CryptoPrice
-import net.thauvin.erik.crypto.CryptoPrice.Companion.marketPrice
+import net.thauvin.erik.crypto.CryptoPrice.Companion.spotPrice
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.msg.PublicMessage
 
-import java.text.NumberFormat
-import java.util.Currency
-
 /**
  * The Cryptocurrency Prices  module.
  */
@@ -56,7 +53,7 @@ class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
                     val price = currentPrice(args.split(' '))
                     val amount = try {
                         price.toCurrency()
-                    } catch (e: IllegalArgumentException) {
+                    } catch (ignore: IllegalArgumentException) {
                         price.amount
                     }
                     send(sender, PublicMessage("${price.base}: $amount [${price.currency}]"))
@@ -82,9 +79,9 @@ class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
          */
         fun currentPrice(args: List<String>): CryptoPrice {
             return if (args.size == 2)
-                marketPrice(args[0], args[1])
+                spotPrice(args[0], args[1])
             else
-                marketPrice(args[0])
+                spotPrice(args[0])
         }
     }
 
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
index f046b59..98a72cb 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
@@ -45,11 +45,11 @@ class CryptoPricesTest {
         var price = currentPrice(listOf("BTC"))
         assertThat(price.base).describedAs("is BTC").isEqualTo("BTC")
         assertThat(price.currency).describedAs("is USD").isEqualTo("USD")
-        assertThat(price.amount).describedAs("BTC > 0").isGreaterThan(0.00)
+        assertThat(price.amount.signum() > 0).describedAs("BTC > 0").isTrue
 
         price = currentPrice(listOf("ETH", "EUR"))
         assertThat(price.base).describedAs("is ETH").isEqualTo("ETH")
         assertThat(price.currency).describedAs("is EUR").isEqualTo("EUR")
-        assertThat(price.amount).describedAs("ETH > 0").isGreaterThan(0.00)
+        assertThat(price.amount.signum() > 0).describedAs("ETH > 0").isTrue
     }
 }
diff --git a/version.properties b/version.properties
index 854ee64..68e52a4 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue May 25 18:01:58 PDT 2021
-version.buildmeta=848
+#Fri May 28 11:26:02 PDT 2021
+version.buildmeta=854
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+848
+version.semver=0.8.0-beta+854

From e873d01338dfa56f4c48da47ed41fe9330d09ad8 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 28 May 2021 11:37:25 -0700
Subject: [PATCH 181/262] Fixed Google search test for GitHub CI.

---
 .../net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt    | 2 +-
 version.properties                                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index f2fec0b..aa4d98e 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -49,7 +49,7 @@ class GoogleSearchTest : LocalProperties() {
         try {
             var messages = searchGoogle("mobitopia", apiKey, cseKey)
             assertThat(messages).describedAs("mobitopia results not empty").isNotEmpty
-            assertThat(messages[0].msg).describedAs("found mobibtopia").contains("mobitopia")
+            assertThat(messages[0].msg).describedAs("found mobibtopia").containsIgnoringCase("mobitopia")
             messages = searchGoogle("aapl", apiKey, cseKey)
             assertThat(messages).describedAs("aapl results not empty").isNotEmpty
             assertThat(messages[0].msg).describedAs("found apple").containsIgnoringCase("apple")
diff --git a/version.properties b/version.properties
index 68e52a4..b0d3bda 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri May 28 11:26:02 PDT 2021
-version.buildmeta=854
+#Fri May 28 11:36:41 PDT 2021
+version.buildmeta=855
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+854
+version.semver=0.8.0-beta+855

From 3f628e58f02399ca4adf435218fb52b8af25110f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 29 May 2021 22:01:18 -0700
Subject: [PATCH 182/262] Updated PMD rules.

---
 build.gradle                                  |  31 +-
 config/pmd.xml                                | 290 +++++-------------
 .../net/thauvin/erik/mobibot/modules/War.java |   6 +-
 version.properties                            |   6 +-
 4 files changed, 90 insertions(+), 243 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9380b95..b1cd168 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 
 ext.versions = [
     log4j   : '2.14.1',
-    pmd     : '6.34.0',
+    pmd     : '6.35.0',
 ]
 
 repositories {
@@ -65,8 +65,8 @@ dependencies {
 
 test {
     testLogging {
-        exceptionFormat "full"
-        events /* "passed", */ "skipped", "failed"
+        exceptionFormat = "full"
+        events(/* "passed", */ "skipped", "failed")
     }
     useTestNG() {
         options.suites('src/test/resources/testng.xml')
@@ -129,7 +129,7 @@ clean {
 }
 
 run {
-    args '-d'
+    args('-d')
 }
 
 incrementBuildMeta {
@@ -144,9 +144,9 @@ incrementBuildMeta {
 
 sonarqube {
     properties {
-        property "sonar.organization", "ethauvin-github"
-        property "sonar.projectKey", "ethauvin_mobibot"
-        property "sonar.host.url", "https://sonarcloud.io"
+        property("sonar.organization", "ethauvin-github")
+        property("sonar.projectKey", "ethauvin_mobibot")
+        property("sonar.host.url", "https://sonarcloud.io")
     }
 }
 
@@ -155,7 +155,7 @@ jacoco {
 }
 
 jacocoTestReport {
-    dependsOn test
+    dependsOn(test)
     reports {
         html.enabled = true
         xml.enabled = true
@@ -175,27 +175,26 @@ tasks.sonarqube {
 
 task copyToDeploy(type: Copy) {
     from('properties')
-    from jar
-    into deployDir
+    from(jar)
+    into(deployDir)
 }
 
 task copyToDeployLib(type: Copy) {
     from(configurations.runtimeClasspath) {
-        exclude 'annotations-*.jar'
+        exclude('annotations-*.jar')
     }
-    into deployDir + '/lib'
+    into(deployDir + '/lib')
 }
 
 task deploy(dependsOn: ['clean', 'build', 'jar']) {
     description = "Copies all needed files to the ${deployDir} directory."
     group = 'Publishing'
-    outputs.dir deployDir
-    inputs.files copyToDeploy
-    inputs.files copyToDeployLib
+    outputs.dir(deployDir)
+    inputs.files(copyToDeploy, copyToDeployLib)
     doLast {
         file(deployDir + '/logs').mkdir()
     }
-    mustRunAfter clean
+    mustRunAfter(clean)
 }
 
 task release(dependsOn: ['wrapper', 'deploy']) {
diff --git a/config/pmd.xml b/config/pmd.xml
index 2760bff..890a490 100644
--- a/config/pmd.xml
+++ b/config/pmd.xml
@@ -1,116 +1,82 @@
 <?xml version="1.0"?>
 <ruleset name="erik"
-    xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">
     <description>Erik's Ruleset</description>
     <!-- BEST PRACTICES -->
-    <rule ref="category/java/bestpractices.xml/AvoidMessageDigestField"/>
-    <!-- <rule ref="category/java/bestpractices.xml/AvoidStringBufferField"/> -->
-    <rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
-    <rule ref="category/java/bestpractices.xml/CheckResultSet"/>
-    <rule ref="category/java/bestpractices.xml/ConstantsInInterface"/>
-    <rule ref="category/java/bestpractices.xml/DefaultLabelNotLastInSwitchStmt"/>
-    <rule ref="category/java/bestpractices.xml/DoubleBraceInitialization"/>
-    <rule ref="category/java/bestpractices.xml/ForLoopCanBeForeach"/>
-    <rule ref="category/java/bestpractices.xml/GuardLogStatement"/>
-    <rule ref="category/java/bestpractices.xml/LiteralsFirstInComparisons" />
-    <!-- <rule ref="category/java/bestpractices.xml/LooseCoupling"/> -->
-    <rule ref="category/java/bestpractices.xml/MethodReturnsInternalArray"/>
+    <rule ref="category/java/bestpractices.xml">
+        <exclude name="AvoidPrintStackTrace"/>
+        <exclude name="JUnit4TestShouldUseTestAnnotation"/>
+        <exclude name="JUnitTestContainsTooManyAsserts"/>
+    </rule>
+
     <rule ref="category/java/bestpractices.xml/MissingOverride">
         <properties>
-            <property name="violationSuppressXPath" value="//MethodDeclaration[@Name='hashCode' or @Name='equals' or @Name='toString']"/>
+            <property name="violationSuppressXPath"
+                      value="//MethodDeclaration[@Name='hashCode' or @Name='equals' or @Name='toString']"/>
         </properties>
     </rule>
-    <rule ref="category/java/bestpractices.xml/OneDeclarationPerLine"/>
-    <rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
-    <rule ref="category/java/bestpractices.xml/ReplaceEnumerationWithIterator"/>
-    <!-- <rule ref="category/java/bestpractices.xml/ReplaceHashtableWithMap"/>
-    <rule ref="category/java/bestpractices.xml/ReplaceVectorWithList"/> -->
-    <rule ref="category/java/bestpractices.xml/SwitchStmtsShouldHaveDefault"/>
-    <rule ref="category/java/bestpractices.xml/SystemPrintln"/>
-    <rule ref="category/java/bestpractices.xml/UnusedAssignment"/>
-    <rule ref="category/java/bestpractices.xml/UnusedFormalParameter"/>
-    <rule ref="category/java/bestpractices.xml/UnusedLocalVariable"/>
-    <rule ref="category/java/bestpractices.xml/UnusedPrivateField"/>
-    <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"/>
-    <rule ref="category/java/bestpractices.xml/UseAssertEqualsInsteadOfAssertTrue"/>
-    <rule ref="category/java/bestpractices.xml/UseAssertNullInsteadOfAssertTrue"/>
-    <rule ref="category/java/bestpractices.xml/UseAssertSameInsteadOfAssertTrue"/>
-    <rule ref="category/java/bestpractices.xml/UseAssertTrueInsteadOfAssertEquals"/>
-    <rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty"/>
-    <rule ref="category/java/bestpractices.xml/UseVarargs"/>
 
 
-    <!-- NAMING CONVENTIONS -->
-    <!-- <rule ref="category/java/codestyle.xml/ClassNamingConventions"/> -->
-    <rule ref="category/java/codestyle.xml/FormalParameterNamingConventions"/>
-    <rule ref="category/java/codestyle.xml/GenericsNaming"/>
-    <rule ref="category/java/codestyle.xml/LocalVariableNamingConventions"/>
-    <rule ref="category/java/codestyle.xml/MethodNamingConventions"/>
-    <!-- <rule ref="category/java/codestyle.xml/PackageCase"/> -->
-
-
-    <!-- OTHER -->
-    <rule ref="category/java/codestyle.xml/AvoidDollarSigns"/>
-    <rule ref="category/java/codestyle.xml/AvoidProtectedFieldInFinalClass"/>
-    <rule ref="category/java/codestyle.xml/AvoidProtectedMethodInFinalClassNotExtending"/>
-    <rule ref="category/java/codestyle.xml/AvoidUsingNativeCode"/>
-    <rule ref="category/java/codestyle.xml/BooleanGetMethodName"/>
-    <rule ref="category/java/codestyle.xml/CallSuperInConstructor"/>
-    <rule ref="category/java/codestyle.xml/ControlStatementBraces"/>
-    <rule ref="category/java/codestyle.xml/EmptyMethodInAbstractClassShouldBeAbstract"/>
-    <rule ref="category/java/codestyle.xml/ExtendsObject"/>
-    <rule ref="category/java/codestyle.xml/FieldDeclarationsShouldBeAtStartOfClass"/>
-    <rule ref="category/java/codestyle.xml/ForLoopShouldBeWhileLoop"/>
-    <rule ref="category/java/codestyle.xml/IdenticalCatchBranches"/>
-    <rule ref="category/java/codestyle.xml/LocalVariableCouldBeFinal"/>
-    <rule ref="category/java/codestyle.xml/MethodArgumentCouldBeFinal"/>
-    <rule ref="category/java/codestyle.xml/NoPackage"/>
-    <rule ref="category/java/codestyle.xml/PrematureDeclaration"/>
-    <rule ref="category/java/codestyle.xml/TooManyStaticImports"/>
-    <rule ref="category/java/codestyle.xml/UnnecessaryAnnotationValueElement"/>
-    <rule ref="category/java/codestyle.xml/UnnecessaryConstructor"/>
-    <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
-    <rule ref="category/java/codestyle.xml/UnnecessaryLocalBeforeReturn"/>
-    <!-- <rule ref="category/java/codestyle.xml/UnnecessaryModifier"/> -->
-    <rule ref="category/java/codestyle.xml/UnnecessaryReturn"/>
-    <!-- <rule ref="category/java/codestyle.xml/UselessParentheses"/> -->
-    <rule ref="category/java/codestyle.xml/UselessQualifiedThis"/>
-
+    <!-- CODE STYLE -->
+    <rule ref="category/java/codestyle.xml">
+        <exclude name="AtLeastOneConstructor"/>
+        <exclude name="ClassNamingConventions"/>
+        <exclude name="ConfusingTernary"/>
+        <exclude name="CommentDefaultAccessModifier"/>
+        <exclude name="DefaultPackage"/>
+        <exclude name="FieldNamingConventions"/>
+        <exclude name="LongVariable"/>
+        <exclude name="OnlyOneReturn"/>
+        <exclude name="PackageCase"/>
+        <exclude name="ShortClassName"/>
+        <exclude name="ShortMethodName"/>
+        <exclude name="ShortVariable"/>
+        <exclude name="UselessParentheses"/>
+        <exclude name="UseUnderscoresInNumericLiterals"/>
+    </rule>
 
     <!-- DESIGN -->
-    <rule ref="category/java/design.xml/AbstractClassWithoutAnyMethod"/>
-    <rule ref="category/java/design.xml/AvoidRethrowingException"/>
-    <rule ref="category/java/design.xml/AvoidThrowingNewInstanceOfSameException"/>
-    <rule ref="category/java/design.xml/AvoidThrowingNullPointerException"/>
-    <rule ref="category/java/design.xml/AvoidThrowingRawExceptionTypes"/>
-    <rule ref="category/java/design.xml/ClassWithOnlyPrivateConstructorsShouldBeFinal"/>
-    <rule ref="category/java/design.xml/CollapsibleIfStatements"/>
-    <rule ref="category/java/design.xml/CouplingBetweenObjects"/>
-    <rule ref="category/java/design.xml/DataClass"/>
-    <rule ref="category/java/design.xml/DoNotExtendJavaLangError"/>
-    <rule ref="category/java/design.xml/ExceptionAsFlowControl"/>
-    <!-- <rule ref="category/java/design.xml/ExcessivePublicCount"/> -->
-    <rule ref="category/java/design.xml/FinalFieldCouldBeStatic"/>
-    <rule ref="category/java/design.xml/ImmutableField"/>
-    <rule ref="category/java/design.xml/LogicInversion"/>
-    <rule ref="category/java/design.xml/SignatureDeclareThrowsException"/>
-    <rule ref="category/java/design.xml/SimplifiedTernary"/>
-    <rule ref="category/java/design.xml/SimplifyBooleanAssertion"/>
-    <rule ref="category/java/design.xml/SimplifyBooleanExpressions"/>
-    <rule ref="category/java/design.xml/SimplifyBooleanReturns"/>
-    <rule ref="category/java/design.xml/SimplifyConditional"/>
-    <rule ref="category/java/design.xml/SingularField"/>
-    <rule ref="category/java/design.xml/SwitchDensity"/>
-    <rule ref="category/java/design.xml/UselessOverridingMethod"/>
-    <rule ref="category/java/design.xml/UseUtilityClass"/>
+    <rule ref="category/java/design.xml">
+        <exclude name="AvoidCatchingGenericException"/>
+        <exclude name="AvoidDeeplyNestedIfStmts"/>
+        <exclude name="AvoidUncheckedExceptionsInSignatures"/>
+        <exclude name="CognitiveComplexity"/>
+        <exclude name="CyclomaticComplexity"/>
+        <exclude name="ExcessiveClassLength"/>
+        <exclude name="ExcessiveMethodLength"/>
+        <exclude name="ExcessiveParameterList"/>
+        <exclude name="ExcessivePublicCount"/>
+        <exclude name="GodClass"/>
+        <exclude name="LawOfDemeter"/>
+        <exclude name="LoosePackageCoupling"/>
+        <exclude name="NPathComplexity"/>
+        <exclude name="NcssCount"/>
+        <exclude name="TooManyFields"/>
+        <exclude name="TooManyMethods"/>
+        <exclude name="UseObjectForClearerAPI"/>
+    </rule>
 
     <!-- DOCUMENTATION -->
-    <rule ref="category/java/documentation.xml/UncommentedEmptyConstructor"/>
-    <rule ref="category/java/documentation.xml/UncommentedEmptyMethodBody"/>
-
+    <rule ref="category/java/documentation.xml">
+        <exclude name="CommentRequired"/>
+        <exclude name="CommentSize"/>
+    </rule>
 
     <!-- ERROR PRONE -->
+    <rule ref="category/java/errorprone.xml">
+        <exclude name="AssignmentInOperand"/>
+        <exclude name="AvoidCatchingNPE"/>
+        <exclude name="AvoidDuplicateLiterals"/>
+        <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="AvoidFieldNameMatchingTypeName"/>
+        <exclude name="AvoidLiteralsInIfCondition"/>
+        <exclude name="BeanMembersShouldSerialize"/>
+        <exclude name="EmptyCatchBlock"/>
+        <exclude name="NullAssignment"/>
+    </rule>
+
     <rule ref="category/java/errorprone.xml/AssignmentInOperand">
         <properties>
             <property name="allowWhile" value="true"/>
@@ -118,85 +84,11 @@
             <property name="allowIf" value="true"/>
         </properties>
     </rule>
-    <rule ref="category/java/errorprone.xml/AssignmentToNonFinalStatic"/>
-    <rule ref="category/java/errorprone.xml/AvoidAccessibilityAlteration"/>
-    <rule ref="category/java/errorprone.xml/AvoidAssertAsIdentifier"/>
-    <rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop"/>
-    <rule ref="category/java/errorprone.xml/AvoidCallingFinalize"/>
-    <rule ref="category/java/errorprone.xml/AvoidCatchingThrowable"/>
-    <rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor"/>
     <rule ref="category/java/errorprone.xml/AvoidDuplicateLiterals">
         <properties>
             <property name="skipAnnotations" value="true"/>
         </properties>
     </rule>
-    <rule ref="category/java/errorprone.xml/AvoidEnumAsIdentifier"/>
-    <rule ref="category/java/errorprone.xml/AvoidInstanceofChecksInCatchClause"/>
-    <rule ref="category/java/errorprone.xml/AvoidLosingExceptionInformation"/>
-    <rule ref="category/java/errorprone.xml/AvoidMultipleUnaryOperators"/>
-    <rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
-    <rule ref="category/java/errorprone.xml/BadComparison"/>
-    <rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
-    <rule ref="category/java/errorprone.xml/CallSuperFirst"/>
-    <rule ref="category/java/errorprone.xml/CallSuperLast"/>
-    <rule ref="category/java/errorprone.xml/CheckSkipResult"/>
-    <rule ref="category/java/errorprone.xml/ClassCastExceptionWithToArray"/>
-    <rule ref="category/java/errorprone.xml/CloneMethodMustBePublic"/>
-    <rule ref="category/java/errorprone.xml/CloneMethodMustImplementCloneable"/>
-    <rule ref="category/java/errorprone.xml/CloneMethodReturnTypeMustMatchClassName"/>
-    <rule ref="category/java/errorprone.xml/CloneThrowsCloneNotSupportedException"/>
-    <rule ref="category/java/errorprone.xml/CloseResource"/>
-    <rule ref="category/java/errorprone.xml/CompareObjectsWithEquals"/>
-    <rule ref="category/java/errorprone.xml/ConstructorCallsOverridableMethod"/>
-    <rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
-    <rule ref="category/java/errorprone.xml/DoNotExtendJavaLangThrowable"/>
-    <rule ref="category/java/errorprone.xml/DoNotHardCodeSDCard"/>
-    <rule ref="category/java/errorprone.xml/DoNotThrowExceptionInFinally"/>
-    <rule ref="category/java/errorprone.xml/DontImportSun"/>
-    <rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices"/>
-    <rule ref="category/java/errorprone.xml/EqualsNull"/>
-    <rule ref="category/java/errorprone.xml/FinalizeDoesNotCallSuperFinalize"/>
-    <rule ref="category/java/errorprone.xml/FinalizeOnlyCallsSuperFinalize"/>
-    <rule ref="category/java/errorprone.xml/FinalizeOverloaded"/>
-    <rule ref="category/java/errorprone.xml/FinalizeShouldBeProtected"/>
-    <rule ref="category/java/errorprone.xml/IdempotentOperations"/>
-    <rule ref="category/java/errorprone.xml/InstantiationToGetClass"/>
-    <rule ref="category/java/errorprone.xml/InvalidLogMessageFormat"/>
-    <rule ref="category/java/errorprone.xml/JumbledIncrementer"/>
-    <rule ref="category/java/errorprone.xml/JUnitSpelling"/>
-    <rule ref="category/java/errorprone.xml/JUnitStaticSuite"/>
-    <rule ref="category/java/errorprone.xml/MethodWithSameNameAsEnclosingClass"/>
-    <rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
-    <rule ref="category/java/errorprone.xml/MissingBreakInSwitch"/>
-    <rule ref="category/java/errorprone.xml/MissingSerialVersionUID"/>
-    <rule ref="category/java/errorprone.xml/MissingStaticMethodInNonInstantiatableClass"/>
-    <rule ref="category/java/errorprone.xml/MoreThanOneLogger"/>
-    <rule ref="category/java/errorprone.xml/NonCaseLabelInSwitchStatement"/>
-    <rule ref="category/java/errorprone.xml/NonStaticInitializer"/>
-    <!-- <rule ref="category/java/errorprone.xml/NullAssignment"/> -->
-    <rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode"/>
-    <rule ref="category/java/errorprone.xml/ProperCloneImplementation"/>
-    <rule ref="category/java/errorprone.xml/ProperLogger"/>
-    <rule ref="category/java/errorprone.xml/ReturnEmptyArrayRatherThanNull"/>
-    <rule ref="category/java/errorprone.xml/ReturnFromFinallyBlock"/>
-    <rule ref="category/java/errorprone.xml/SimpleDateFormatNeedsLocale"/>
-    <rule ref="category/java/errorprone.xml/SingleMethodSingleton"/>
-    <rule ref="category/java/errorprone.xml/SingletonClassReturningNewInstance"/>
-    <rule ref="category/java/errorprone.xml/StaticEJBFieldShouldBeFinal"/>
-    <rule ref="category/java/errorprone.xml/StringBufferInstantiationWithChar"/>
-    <rule ref="category/java/errorprone.xml/SuspiciousEqualsMethodName"/>
-    <rule ref="category/java/errorprone.xml/SuspiciousHashcodeMethodName"/>
-    <rule ref="category/java/errorprone.xml/SuspiciousOctalEscape"/>
-    <rule ref="category/java/errorprone.xml/TestClassWithoutTestCases"/>
-    <rule ref="category/java/errorprone.xml/UnconditionalIfStatement"/>
-    <rule ref="category/java/errorprone.xml/UnnecessaryBooleanAssertion"/>
-    <rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>
-    <rule ref="category/java/errorprone.xml/UnnecessaryConversionTemporary"/>
-    <rule ref="category/java/errorprone.xml/UnusedNullCheckInEquals"/>
-    <rule ref="category/java/errorprone.xml/UseCorrectExceptionLogging"/>
-    <rule ref="category/java/errorprone.xml/UseEqualsToCompareStrings"/>
-    <rule ref="category/java/errorprone.xml/UselessOperationOnImmutable"/>
-    <rule ref="category/java/errorprone.xml/UseLocaleWithCaseConversions"/>
     <rule ref="category/java/errorprone.xml/EmptyCatchBlock">
         <properties>
             <property name="allowExceptionNameRegex">
@@ -204,60 +96,16 @@
             </property>
         </properties>
     </rule>
-    <rule ref="category/java/errorprone.xml/EmptyFinalizer"/>
-    <rule ref="category/java/errorprone.xml/EmptyFinallyBlock"/>
-    <rule ref="category/java/errorprone.xml/EmptyIfStmt"/>
-    <rule ref="category/java/errorprone.xml/EmptyInitializer"/>
-    <rule ref="category/java/errorprone.xml/EmptyStatementBlock"/>
-    <rule ref="category/java/errorprone.xml/EmptyStatementNotInLoop"/>
-    <rule ref="category/java/errorprone.xml/EmptySwitchStatements"/>
-    <rule ref="category/java/errorprone.xml/EmptySynchronizedBlock"/>
-    <rule ref="category/java/errorprone.xml/EmptyTryBlock"/>
-    <rule ref="category/java/errorprone.xml/EmptyWhileStmt"/>
-
 
     <!-- MULTITHREADING -->
-    <rule ref="category/java/multithreading.xml/AvoidSynchronizedAtMethodLevel"/>
-    <rule ref="category/java/multithreading.xml/AvoidThreadGroup"/>
-    <rule ref="category/java/multithreading.xml/AvoidUsingVolatile"/>
-    <rule ref="category/java/multithreading.xml/DontCallThreadRun"/>
-    <rule ref="category/java/multithreading.xml/DoubleCheckedLocking"/>
-    <rule ref="category/java/multithreading.xml/NonThreadSafeSingleton"/>
-    <rule ref="category/java/multithreading.xml/UnsynchronizedStaticFormatter"/>
-    <rule ref="category/java/multithreading.xml/UseConcurrentHashMap"/>
-    <rule ref="category/java/multithreading.xml/UseNotifyAllInsteadOfNotify"/>
+    <rule ref="category/java/multithreading.xml">
+    </rule>
 
     <!-- PERFORMANCE -->
-    <rule ref="category/java/performance.xml/AddEmptyString"/>
-    <rule ref="category/java/performance.xml/AppendCharacterWithChar"/>
-    <rule ref="category/java/performance.xml/AvoidArrayLoops"/>
-    <rule ref="category/java/performance.xml/AvoidFileStream"/>
-    <rule ref="category/java/performance.xml/AvoidInstantiatingObjectsInLoops"/>
-    <rule ref="category/java/performance.xml/BigIntegerInstantiation"/>
-    <rule ref="category/java/performance.xml/BooleanInstantiation"/>
-    <rule ref="category/java/performance.xml/ByteInstantiation"/>
-    <rule ref="category/java/performance.xml/ConsecutiveAppendsShouldReuse"/>
-    <rule ref="category/java/performance.xml/ConsecutiveLiteralAppends"/>
-    <rule ref="category/java/performance.xml/InefficientEmptyStringCheck"/>
-    <rule ref="category/java/performance.xml/InefficientStringBuffering"/>
-    <rule ref="category/java/performance.xml/InsufficientStringBufferDeclaration"/>
-    <rule ref="category/java/performance.xml/IntegerInstantiation"/>
-    <rule ref="category/java/performance.xml/LongInstantiation"/>
-    <rule ref="category/java/performance.xml/OptimizableToArrayCall"/>
-    <rule ref="category/java/performance.xml/RedundantFieldInitializer"/>
-    <rule ref="category/java/performance.xml/ShortInstantiation"/>
-    <rule ref="category/java/performance.xml/StringInstantiation"/>
-    <rule ref="category/java/performance.xml/StringToString"/>
-    <rule ref="category/java/performance.xml/TooFewBranchesForASwitchStatement"/>
-    <rule ref="category/java/performance.xml/UnnecessaryWrapperObjectCreation"/>
-    <!-- <rule ref="category/java/performance.xml/UseArrayListInsteadOfVector"/> -->
-    <rule ref="category/java/performance.xml/UseArraysAsList"/>
-    <rule ref="category/java/performance.xml/UseIndexOfChar"/>
-    <rule ref="category/java/performance.xml/UselessStringValueOf"/>
-    <rule ref="category/java/performance.xml/UseStringBufferForStringAppends"/>
-    <rule ref="category/java/performance.xml/UseStringBufferLength"/>
+    <rule ref="category/java/performance.xml">
+    </rule>
 
     <!-- SECURITY -->
-    <rule ref="category/java/security.xml/HardCodedCryptoKey"/>
-    <rule ref="category/java/security.xml/InsecureCryptoIv"/>
+    <rule ref="category/java/security.xml">
+    </rule>
 </ruleset>
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 32cf9e6..88e70f7 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -52,10 +52,10 @@ public final class War extends AbstractModule {
     // War command
     private static final String WAR_CMD = "war";
     // Deck of card
-    private static final String[] WAR_DECK =
-            new String[]{"Ace", "King", "Queen", "Jack", "10", "9", "8", "7", "6", "5", "4", "3", "2"};
+    private static final String[] WAR_DECK = 
+        {"Ace", "King", "Queen", "Jack", "10", "9", "8", "7", "6", "5", "4", "3", "2"};
     // Suits for the deck of card
-    private static final String[] WAR_SUITS = new String[]{"Hearts", "Spades", "Diamonds", "Clubs"};
+    private static final String[] WAR_SUITS = {"Hearts", "Spades", "Diamonds", "Clubs"};
 
     /**
      * The default constructor.
diff --git a/version.properties b/version.properties
index b0d3bda..772f2ee 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri May 28 11:36:41 PDT 2021
-version.buildmeta=855
+#Sat May 29 22:00:14 PDT 2021
+version.buildmeta=866
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+855
+version.semver=0.8.0-beta+866

From b2dcf781c200e9f209ebef58e8b7b7e38f218af1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 31 May 2021 01:49:35 -0700
Subject: [PATCH 183/262] Added Gihub workflow matrix for Java 11 & 15.

---
 .github/workflows/gradle.yml | 25 ++++++++++++++++++-------
 build.gradle                 | 34 ++++++++++++++++++----------------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index c447ffe..a673ac4 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -5,17 +5,24 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-latest
+    env:
+      GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
+      SONAR_JDK: "11"
+    strategy:
+      matrix:
+        java-version: [ 11, 15 ]
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
+      - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: ${{ matrix.java-version }}
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Cache SonarCloud packages
+        if: matrix.java-version == env.SONAR_JDK
         uses: actions/cache@v1
         with:
           path: ~/.sonar/cache
@@ -27,25 +34,29 @@ jobs:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
-            ${{ runner.os }}-gradle-
+            ${{ runner.os }}-gradle-${{ matrix.java-version }}-
       - name: Test with Gradle
         env:
           CI_NAME: "GitHub CI"
           ALPHAVANTAGE_API_KEY: ${{ secrets.ALPHAVANTAGE_API_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
           GOOGLE_CSE_CX: ${{ secrets.GOOGLE_CSE_CX }}
           OWM_API_KEY: ${{ secrets.OWM_API_KEY }}
           PINBOARD_API_TOKEN: ${{ secrets.PINBOARD_API_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
           TWITTER_CONSUMERKEY: ${{ secrets.TWITTER_CONSUMERKEY }}
           TWITTER_CONSUMERSECRET: ${{ secrets.TWITTER_CONSUMERSECRET }}
           TWITTER_HANDLE: ${{ secrets.TWITTER_HANDLE }}
           TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }}
           TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }}
-        run: ./gradlew check sonarqube
+        run: ./gradlew build check --stacktrace
+      - name: SonarCloud
+        if: success() && matrix.java-version == env.SONAR_JDK
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: ./gradlew sonarqube
       - name: Cleanup Gradle Cache
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
diff --git a/build.gradle b/build.gradle
index b1cd168..500333a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,8 +65,8 @@ dependencies {
 
 test {
     testLogging {
-        exceptionFormat = "full"
-        events(/* "passed", */ "skipped", "failed")
+        exceptionFormat = 'full'
+        events('skipped', 'failed')
     }
     useTestNG() {
         options.suites('src/test/resources/testng.xml')
@@ -80,7 +80,7 @@ java {
 
 kapt {
     arguments {
-        arg("semver.project.dir", projectDir)
+        arg('semver.project.dir', projectDir)
     }
 }
 
@@ -93,7 +93,7 @@ tasks.withType(JavaCompile) {
 }
 
 compileJava {
-    dependsOn('incrementBuildMeta')
+    dependsOn 'incrementBuildMeta'
     options.compilerArgs += ['-Xlint:unchecked', '-Xlint:deprecation']
 }
 
@@ -137,16 +137,16 @@ incrementBuildMeta {
         if (!System.getenv('CI')) {
             buildMeta = sprintf("%03d", (buildMeta as Integer) + 1)
         } else {
-            println "No increment on CIs."
+            println 'No increment on CIs.'
         }
     }
 }
 
 sonarqube {
     properties {
-        property("sonar.organization", "ethauvin-github")
-        property("sonar.projectKey", "ethauvin_mobibot")
-        property("sonar.host.url", "https://sonarcloud.io")
+        property('sonar.organization', 'ethauvin-github')
+        property('sonar.projectKey', 'ethauvin_mobibot')
+        property('sonar.host.url', 'https://sonarcloud.io')
     }
 }
 
@@ -170,34 +170,36 @@ tasks.withType(Checkstyle) {
 }
 
 tasks.sonarqube {
-    dependsOn("jacocoTestReport")
+    dependsOn('jacocoTestReport')
 }
 
 task copyToDeploy(type: Copy) {
     from('properties')
-    from(jar)
-    into(deployDir)
+    from jar
+    into deployDir
 }
 
 task copyToDeployLib(type: Copy) {
     from(configurations.runtimeClasspath) {
-        exclude('annotations-*.jar')
+        exclude 'annotations-*.jar'
     }
     into(deployDir + '/lib')
 }
 
-task deploy(dependsOn: ['clean', 'build', 'jar']) {
+task deploy {
     description = "Copies all needed files to the ${deployDir} directory."
     group = 'Publishing'
-    outputs.dir(deployDir)
+    dependsOn(clean, build, jar)
+    outputs.dir deployDir
     inputs.files(copyToDeploy, copyToDeployLib)
     doLast {
         file(deployDir + '/logs').mkdir()
     }
-    mustRunAfter(clean)
+    mustRunAfter clean
 }
 
-task release(dependsOn: ['wrapper', 'deploy']) {
+task release {
     group = 'Publishing'
     description = 'Releases new version.'
+    dependsOn(wrapper, 'deploy')
 }

From e35d112b28285e8163f17844a9b71d80014f2c05 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 11 Jun 2021 20:22:57 -0700
Subject: [PATCH 184/262] Cleanup.

---
 .github/workflows/gradle.yml | 10 ++++++++++
 build.gradle                 | 10 ++++------
 version.properties           |  6 +++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index a673ac4..715e6fe 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -5,22 +5,28 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-latest
+
     env:
       GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
       SONAR_JDK: "11"
+
     strategy:
       matrix:
         java-version: [ 11, 15 ]
+
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
+
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java-version }}
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+
       - name: Cache SonarCloud packages
         if: matrix.java-version == env.SONAR_JDK
         uses: actions/cache@v1
@@ -28,6 +34,7 @@ jobs:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
+
       - name: Cache Gradle packages
         uses: actions/cache@v2
         with:
@@ -37,6 +44,7 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ matrix.java-version }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-${{ matrix.java-version }}-
+
       - name: Test with Gradle
         env:
           CI_NAME: "GitHub CI"
@@ -51,12 +59,14 @@ jobs:
           TWITTER_TOKEN: ${{ secrets.TWITTER_TOKEN }}
           TWITTER_TOKENSECRET: ${{ secrets.TWITTER_TOKENSECRET }}
         run: ./gradlew build check --stacktrace
+
       - name: SonarCloud
         if: success() && matrix.java-version == env.SONAR_JDK
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: ./gradlew sonarqube
+
       - name: Cleanup Gradle Cache
         run: |
           rm -f ~/.gradle/caches/modules-2/modules-2.lock
diff --git a/build.gradle b/build.gradle
index 500333a..5c5d0b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ plugins {
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
     id 'org.jetbrains.kotlin.jvm' version '1.5.10'
     id 'org.jetbrains.kotlin.kapt' version '1.5.10'
-    id 'org.sonarqube' version '3.2.0'
+    id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
 
@@ -19,6 +19,8 @@ final def packageName = 'net.thauvin.erik.mobibot'
 final def deployDir = 'deploy'
 final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 
+mainClassName = packageName + '.Mobibot'
+
 ext.versions = [
     log4j   : '2.14.1',
     pmd     : '6.35.0',
@@ -84,10 +86,6 @@ kapt {
     }
 }
 
-application {
-    mainClassName = packageName + '.Mobibot'
-}
-
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
@@ -129,7 +127,7 @@ clean {
 }
 
 run {
-    args('-d')
+    args('-h')
 }
 
 incrementBuildMeta {
diff --git a/version.properties b/version.properties
index 772f2ee..f04ec96 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat May 29 22:00:14 PDT 2021
-version.buildmeta=866
+#Mon May 31 14:55:18 PDT 2021
+version.buildmeta=870
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+866
+version.semver=0.8.0-beta+870

From 05ef252bf74ce86c6c1d28446b64513d430ad830 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 16 Jun 2021 16:17:18 -0700
Subject: [PATCH 185/262] Moved to irc.libera.chat.

---
 website/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/index.html b/website/index.html
index 6dfd579..fe9468a 100644
--- a/website/index.html
+++ b/website/index.html
@@ -115,8 +115,8 @@
 
     <h3>Using mobibot</h3>
 
-    <p>To use mobibot, simply <strong>join <a href="irc://irc.freenode.net/#mobitopia">#mobitopia</a></strong> on
-        <strong>irc.freenode.net</strong> and type:</p>
+    <p>To use mobibot, simply <strong>join <a href="irc://irc.libera.chat/#mobitopia">#mobitopia</a></strong> on
+        <strong>irc.libera.chat</strong> and type:</p>
 
     <p><code>mobibot: help</code></p>
 

From fdd1fb7e4299dafc5ea254c3f0f8eb4bdc750a2f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 16 Jun 2021 21:58:11 -0700
Subject: [PATCH 186/262] Updated dependencies.

---
 build.gradle                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 59203 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5c5d0b4..7f5e9cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
-    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.assertj:assertj-core:3.20.1'
     testImplementation 'org.testng:testng:7.4.0'
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18435
zcmY&<19zBR)MXm8v2EM7ZQHi-#I|kQZfv7Tn#Q)%81v4zX3d)U4d<S{&&C~|14~>4
zYYc!v@NU%|U;_sM`2z(4BAilWijmR>4U^KdN)D8%@2KLcqkTDW<b;`{sz_0x=?HD$
zfRd}z!dlzv65-&;kfVv!%#n8?Y%uh6t_yvK3%vZ!=sQhW#x&$16>%^3U(Wg>{qkAF
z&RcYr;D1I5aD(N-PnqoEeBN~JyXiT(+@b`4Pv`;KmkBXYN48@0;iXuq6!ytn`vGp$
z6X4DQHMx^WlOek^bde&~cvEO@K$oJ}i`T`N;M|lX0mhmEH<Qh2bO23s<c<b?kJSx>
zuRpo!rS~#&rg}ajBdma$$}+vEhz?JAFUW|iZEcL%amAg_pzqul-B7Itq6Y_BGmOCC
zX*Bw3rFz3R)DXpCVBkI!SoOHt<r_Zw4g3Jlhii6BC+0g(i?Vec^cYS1yA*tD`4TKj
zOApa7lBa#WaS!-2<I(+955H!14q3}J>Ystv*e-May|+?b80ZRh$MZ$FerlC`)ZKt}
zTd0Arf9N2dimjs>mg5&@sfTP<FMra4imH+_IBlL4Nc_~AL#%VJCxe3)stbd02AEM|
z&D0&Tn5H7hbWpsy=sT;pxOd15(iWc{al!mn&C#+i%f3lDS<jx_mG|11KCBpX%ouSo
z@?~hUsz{+<!8=d398xo&@l@S~*jz8h-YM#AGsF0WGkRz@$<m!>sRXKXI;0L~&t+GH
zkB<>wxI9D+k5VHHcB7Rku{Z>i3$&hgd9Mt_hS_GaGg0#2EHzyV=j=u5xSyV~F0*qs
zW{k9}lFZ?H%@4hII_!bzao!S(J^^ZZVmG_;^qXkpJb7OyR*sPL<g~w=Zk9z5S1jDI
z71nU2i<Es|#qXTuJIRx-HjX+gJ*LMd1jHM#UfOkw#&q`-<mI*srz-Ay05DEYB_)#v
zvk_+YZbpT72OHLyzK&`<6&<^A=1Fr^E7_0s%OXF6r^I$M)pZ_3F4o5d`%I9#uyBlZ
zX1C9_iSi<5viI;Yrq>>))Jx{K4xtO2xTr@St!@CJ=y3q2wY5F`77Tqwz8!&Q{f7Dp
zifvzV<QA3qQ_icfAX<_Uh_AWeD00fmmOez9t>V1!Dj*dxG%BsQyRP6${X+Tc$+XOG
zzvq5xcC#&-iXlp$)L=9t{oD~bT~v^ZxQG;FRz|HcZj|^L#_(<kbHS<d%uD<k^y4GS
z_@nGkSrluLeGBfOtQ55e=_#qB)a=_z-;eBz1(Z7to$`|!g;(i3z=gq~yvKKK5sNc#
zl$gJ2XIR<<L*cw&uktYWH>VNG)k{=_6|6Bs-tRNCn-XuaZ^*^hpZ@qw<A`W4NXV_{
zECxbg>i`m|BxcF6IWc?_bhtK_cDZRTw#*bZ2`1@1HcB<A>`mLUmo_>@2R&nj7&CiH
zF&laHkG~7#U>c}rn#H)q^|sk+lc!?6wg0xy`VPn!{4P=u@cs%-V{VisOxVqAR{XX+
zw}R;{Ux@6A_QPka=48|tph^^ZFjSHS1BV3xfrbY84^=?&gX=bmz(7C({=*oy|BEp+
zYgj;<`j)GzINJA>{HeSHC)<cjl~xrBv-Ad;_(!35VQHb!n{j_(E9gc}-sAqiZ7)~T
zGr>bvp6ucoE`c+6#2KzY9)TClmtEB1^^Mk)(mXWYvup02e%Ghm9qyjz#fO3bNGBX}
zFiB>dvc1+If!><mtjfI+&uNcAL5R+)16aVAdoC-IdLWfR^loo9quT)qg_~Y<A<|%J
z{4}JG)2I+AA+2M<X=n8Tj%Y@|gL;a0cu?_0nya~Ds$JH`tyme!ug%h)y+8F-aj3Vs
zM_OOr;e%?DW<F8GdQP&*MHN=uF5OQ@*^d|_+48he#kR1%(q8FHxG~1)pjWd#*S~<-
zsO)|Q{2i9C8z1<O>I10;qZk`?6pEd*(?bI&G*3YLt;MWw&!?=Mf7%^Op?qnyXWur-
zwX|S^P>jF?{m9c&mmK-epCRg#WB+-VDe!2d2~YVoi%7_q(dyC{(}zB${!ElKB2D}P
z7QNFM!*O^?FrPMGZ}wQ0TrQAVqZy!weLhu_Zq&`rlD39r*9&2sJHE(JT0EY5<}~x@
z1>P0!L2IFDqAB!($H9s2fI`&J_c+5QT|b#%99HA3@zUWOuYh(~7q7!Pf_U3u!ij5R
zjFzeZta^~RvAmd_TY+RU@e}wQaB_PNZI26zmtzT4iGJg9U(Wrgrl>J%Z3MKHOWV(?
zj>~Ph$<~8Q_sI+)$DOP^9FE6WhO09EZJ?1W|KidtEjzBX3RCLUwmj9qH1CM=^}MaK
z59kGxRRfH(n|0*lkE?`Rpn6d^u5J6wPfi0WF(rucTv(I;`aW)3;nY=J=igkjsn?ED
ztH&ji>}TW8)o!Jg@9Z}=i2-;o4#xUksQHu}XT~yRny|kg-$Pqeq!^78xAz2mYP9+4
z9gwAot<F`HDf<=vVlS~}$IUDtF0klA`^#pB|G?>i2ICvUWxE&RZ~}E)#M8*zy1iwz
zHqN%q;u+f6Ti|SzI<FRGwCIa?0!fO9WN;kBsxILjw5}w5BK>Lm0s-)=4)>eb5o-0K
zbMW8ecB4p^6OuIX@u`f{>Yn~m9PINEl#+t*jqalwxIx=TeGB9(b6jA}9VOHnE$9sC
zH`;epyH!k-3kNk2XWXW!K`L_G!%xOqk0ljPCMjK&VweAxEaZ=<DzSWjCiKD^*;5J$
zl4gOX?qd<vHF|&G>=cT#;!<B?QV)Sxf^HT@cL_2la1`-IR6ZJ;P$+RaV<afLePi-(
z`iA)b_c_5yafTWN1f-H8r4X4C7}bXH(p^at7}wcudBoe0*%y<B25sgtkcNi&V-$%G
zMSGX5<q?c3;?<OIPu@&cT0xgeo?7m!1=~tj=2jG1wy=Q0Jt$O25951g=k|2gnn%q#
z)8}Dz@%7wCsofkVeUfvN<9Fx(obP+xb&~&3;CkI=_&w{&h_XoYrA)m7ECODqf@l4F
zr=J~G0aXj%UK8SkUZ>7)X&C|X{dY^IY(e4D#!tx^vV3NZqK~--JW~wtXJ8X19ad<I
zm9QB;RzH152H*y3tMn*3EvxkEox&n8T*@N+`8Grw?(i08(CyTVvrdYB<~KAN?m-af
z48ifc{b0Ob(DjSYG@#1{T-ASiogxS*?mdh?gD%n`&#ElaJuKw(ZVs>Xim<W6u2t)u
z6s_ppklZx{7yd_UKBw+|N=In~2BVl!;x!QFZ9|x}y<?)9OHecoqZy3Ivt=}#Q4OL}
zHX1K1MQ2CF*2uHy#a$|F7h=ma*&JbOw43$!kcjqs7DeysG@f1n)sS!+XLYaik%I6Q
zipAB_g8OF4y#?ZDYDeW}jgwU3o7%OecZ~=o`u6c&jknOzmB`r7um)wXimA2gUfH7y
zwN>?PdN(|@o(OdgH3AiHts~?#QkolO?*=U_buYC&tQ3sc(O5HGHN~=6wB@dgIAVT$
z_O<cn@nUEGUT$oFPywe(&63O<$H?qH$ZdDGyOrByWM-n!VN96r=4Si%R!g1l+UnD`
zQey?KU7qiwzmKU}0s?3Fj2Rin=8W1ZMnah!zlFm}iM17m<$e2;<DZ4?9$K``?YR+Q
zC}no$*}t0`uIi4yRIN32V9oeLrVI6T6+Jz_>JWJ^&*40Pw&%y^t8-Wn4@l9gOl`uU
z{Uda_uk9!Iix?KBu9CYwW9Rs=yt_lE11A+k$+)pkY5pXp<hVQ+lx!L-&x;bs6sTWy
z5-jLZ!#e0u)=!m;6eq(oP?P9YA*Tr@kg*nGSid%#)&Itd;r2X&XUd2s?PWTYrzq|2
z53Ns^<9hG_We_Zz8R90$En!t{KH(+#ajodOS-JLijl^nkBeB<yrw*j+6*uuXLyLF9
z{N3t`5+i>ocxIEJe|pTxwFgB%Kpr&tH;PzgOQ&m|<oUQ1dylfIc7Y5Z3j1x;-E4})
zlPALqD3U1psXL!B;q*ehz{Llf;>(#Otm?@H^r`v)9yiR8v&Uy>d#TNdRfyN4Jk;`g
zp+jr5@L2A7TS4=G-#O<`A9o;{En5!I8lVUG?!PMsv~{E_yP%QqqTxxG%8%KxZ{uwS
zOT+EA5`*moN8wwV`Z=wp<3?~f#frmID^K?t7YL<m6VWFb>`G^(X43g<oal-E1{f_!
zMM~2F^%K|Fu~`x<<&sTAc`V5n;Rw6{XkE{;s3-|c+NIU#Skt3b199qOwzF!22Tqf*
zE16<4@?5ePsR(z@^xu8!CWvB;_CSM&hm~uwsrVnilwfgKIQSi1c+dzpZ8QColu7eB
zT&F_jgPa+roCfk+v!rsEdW#ZFy2((cA!saskfsl5@-js1&&gA?clYAmax@Nf1=?Q4
zy-!%e31-Pm3`OUe=&CWnia;bDEY^Qu5IhxOnKWJv>Wbo!6(q*u%HxWh$$^2EOq`Hj
zp=-fS#Av+s9r-M)wGIggQ)b<@-BR`R8l1G@2+KODmn<_$Tzb7k35?e8;!V0G>`(!~
zY~qZz!6*&|TupOcnvsQYPbcMiJ!J{<AUkIQ?T$#YvpqqHZZT}0w>RyfezB^;fceBk
znpA1XS)~KcC%0^_;ihibczSxwBuy;^ksH7lwfq7*GU;TLt*WmUEV<B*)702m>Qxt{
zKSfJf;lk$0XO8~4<V91^$-vD;;s6SSgg|GI(=zrZRux(KOs}+`xmO>8Xn2d<xw$ML
z-Nox99yuWO;%tc<D!o9)3662vJevDRmH3`X>nh8tMC9WHu`%DZj&a`2!tNB`5%;Md
zBs|#T0Ktf?vkWQ)Y+q!At1qgL`C|nbzvgc(+28Q|4N6Geq)Il<kZ3mGp>%+I<Y$q}
zk%HyZpWUh@6{prl<|AyV2rx<i=^VB%K0@I+<ln!^usw3Em(Miio93@zcZ%-v{4&N2
zcYE0Tpd>5c@t02{9^=QJ?=h2BTe`~BEu=_u3xX2&?^zwcQWL+)7dI>JK0g8_`W1n~
zMaEP97X>Ok#=G*nkPmY`VoP8_{~+Rp7DtdSyWxI~?TZHxJ&=6KffcO2Qx1?j7=LZA
z?GQt`oD9QpXw+s7`t+eeLO$cpQpl9(6h3_l9a6OUpbwBasCeCw^UB6we!&h9Ik<t|
zD0oMP!MWpM*U(u`s*F9Hx|}0|3{SpW3>@1zvJ`j4i=tvG9X8o34+N|y(ay~ho$f=l
z514~mP>Z>#6+UxM<6@4z*|hFJ?KnkQBs_9{H(-v!_#Vm6Z4<deXWj{kD3-?t{z(at
z5F960+Lt}Rd_`N{v%m1^3E9$wcvIbH!uR*j0b^-{f_3#Jis!WwN*J7@HbvqL8Zdjq
z$T6F?1c?FFl=g%g8UXxRntAEHa6ofPAW?d>(xV5WgWMd3mB9A(>@XE292#k(HdI7P
zJkQ2)`bQXTKlr}{VrhSF5rK9TsjtGs0Rs&nUMcH@$ZX_`Hh$Uje*)(Wd&oLW($hZQ
z_tPt`{O@f8hZ<}?aQc6~|9iHt>=!%We3=F9yIfiqhXqp=QUVa!@UY@IF5^dr5H8$R
zIh{=%S{$BHG+>~a=vQ={!B9B=<-ID=nyjfA0V8->gN{jRL>Qc4Rc<86;~aY+R!~Vs
zV7MI~gVzGIY`B*Tt@rZk#Lg}H8sL39OE31wr_Bm%mn}8n773R&N)8B;l+-eOD@N$l
zh&~Wz`m1qavVdxwtZLACS(U{rAa0;}KzPq9r76xL?c{&G<UJ=R?LuB}PDO7HVNF<3
zfCse)dXXnk@duX_x6gxT#znrXeb8;xk?)n8E`2<|0F?)>aG5hX_NK!?)iq`t7q*F#
zFoKI{h{*8lb>&sOeHXoAiqm*vV6?C~5U%tXR8^XQ9Y|(XQvcz*>a?%HQ(Vy<2UhNf
zVmGeOO#v159KV@1g`m%gJ<w@$Jfr|I+t<O1vhU+3{qM1CnOgkF@lDWIFY2P&R7=ZP
z8`(YDAz*YyvmlEiqc#;+fy8?1CW()FxYZFSGN+f<<VQg&@m?XNaI27R(!Y^I-zolX
zPCRK)8i0Y7fjRSFQh*v<puB(gBc(MsA|^8jB6IY9u-_<pCipoS@#KuXUh!bv66|sJ
z@P<R+ErTIV%VE03mMc&bKh;NS(uYg30Kyk-WT%%e1g)=e#1+)!2MFss5qM=tVqWUJ
zq~^bP4dz-ZXl-uw@HZ;Ee0<FPo#JTdn9|^s3;-k4yD8(Rg7Q1B5V}fp8dvCBvO-&&
zP<En#@06*@fduhJn_yI@#Nj@hur=#<#27q0QXHv-e#oMi3}5Z28GP}@{CSkcPJVX9
zEhbEH)dxGPDRBmMS)0sW$HHzTu}xfXfFz%}&ac@@z(W!98m-Gh_Aiq9YRq+bsQ@3%
z4j>)XGPLa`a|?9HSzSSX{j;)xg>G(Ncc7+C>AyAWYa(k}5B3mtzg4tsA<Sh;28pD1
zIFs~Z><MDBdusACPh#gSuba$Zxq9XQ9zHgTm9jJRWBl;6MmD|7#OCb+r-NVhSxD`l
zpz{#9n=TYzv1i>=C^Wfezb1&LlyrBE1~kNfeiubLls{C)!<%#m@f}v^o+7<<peV!m
z=VC0_KSpi7FpU+=-~zA*iYIY`A$OK=V*+<-;yaWEHTS+fpQ9nF0e2pd-&@Jw1WOD3
z8GVsYvW1sKoZNTx4OK_oZ>VZ6!FZ;JeiAG@5vw7Li{flC8q1%jD_WP2ApBI{fQ}kN
zhvhmdZ0bb5(qK@VS5-)G+@GK(tuF6eJuuV5>)Odgmt?i_`tB69DWpC~e8gqh!>jr_
zL1~<WJ)Q75x^h;pF?{k_oIs!CDg4%}(~+#drio{%*&0bN?<+bgXDB){8A}v4#SS*<
zI#7-8DmoH|MGeJJ^ryCu?tbd$K%t}510M-_>L0xw@C<fO#AAX{JzQ=;ULY)<=J5}B
z9Z`iyf-Y%TuNp~D5)2(pu9Ft(%eU-|wt$z2&#v?|6IUFZ08w=fc1d*h-vc#mRUp@o
zJ>bMSTmQflpRyjif*Y*O-IVQ_OFhUw-zh<q;LT5p+$IR7zEGtb#X(0BaIHkAvMxDl
z&9|x2$0;2BOM24Yox5>PrXXW>6X}+73IoMsu2?uuK3lT>;W<df@J_cgG_U&D8b<+U
z3qBv6Z5ieNpqShbUSE@10^#D8JvDB<Cxnnc7^ASjodT6b&UsxZ-kMZhrAlLO-#Mi5
zrhImmEN-CGFF$Vg@GnIasHba~Uf74v>#38#qG5tDl66A7Y{mYh=jK8Se!+f=N7%nv
zYSHr6a~Nxd`jqov9VgII{%EpC_jFCEc>>SND0;}*Ja8Kv;G)MK7?T~h((c&FEBcQq
zvUU1hW2^TX(dDCeU@~a1LF-(+#lz3997A@pipD53&Dr@III2tlw>=!iGabjXzbyUJ
z4Hi~M1KCT-5!NR#I%!2Q*A>mqI{dpmUa_mW)%SDs{Iw1LG}0y=wbj@0ba-`q=0!`5
zr(9q1p{#;Rv2CY!L#uTbs(UHVR5+hB@m*zEf4jNu3(Kj$WwW|v?YL*F_0x)GtQC~!
zzrnZRmBmwt+i@uXnk05>uR5&1Ddsx1*WwMrIbPD3yU*2By`71pk@gt{|H0D<#B7&8
z2dVmXp*;B)SWY)U1VSNs4ds!yBAj;P=xtatUx^7_gC5tHsF#vvdV;NmKwmNa1GNWZ
zi_Jn-B4GnJ%xcYWD5h$*z^haku#_Irh818x^KB)3-;ufjf)D0TE#6>|zFf@~pU;Rs
zNw+}c9S+6aPzxkEA6R%s*xhJ37wmgc)-{Zd1&mD5QT}4BQvczWr-Xim>(P^)52`@R
z9<jpXM|@nDonMBF{3f<~Ch;-n8pq}dJ3Jn7z+9MKkVKZ6GC|_U4LQ}uqT7Qzdw&FT
z5rS%8>+Z}44203T5}`AM_G^Snp<_KKc!OrA(5h7{MT^$ZeDsSr(R@^kI?O;}QF)OU
zQ9-`t^ys=6DzgLcWt0U{Q(<zOjFK;@HBO@&MI050VARn}8^41fX2E~H8v7oK7t#cH
zT3cr37+EIOoR3$Tf{>F<SaIxIq6Ub`pA9KKWBtPeF7PVo!TPrUGQ;L27vT$GZ|f!6
zJ3t-%EM4F&3lV=3B&-O?3LtyEID6hjqP^*ia)+pq9l7DVnt4FWB~meyMR+>Bs22=r
zKD%fLQ^5ZF24c-Z)J{xv?x$&4VhO^mswyb4QTIofCvzq+27*WlYm;h@;Bq%i;{hZA
zM97mHI6pP}XFo|^pRTuWQzQs3B-8kY@<y697Pif_+Ask(KR3DV%AUDhMyUIANX3Dk
zwg)}aPAa<Qw({y>ajLV!Fb?OYAO3jFv*W-_;AX<NdmAQ7#KC=m{U8w@o~;*9u@fe3
zI-q=kJGTIh6>d;G!CbpZt04iW`Ie^_+cQZGY_Zd@P<*J9EdRsc>c=edf$K|;voXRJ
zk*aC@@=MKwR120(%I_HX`3pJ+8GMeO>%30t?~uXT0O-Tu-S{JA;zHoSyXs?Z;fy58
zi>sFtI7hoxNAdOt#3#AWFDW)4EPr4kDYq^`s%JkuO7^efX+u#-qZ56aoRM!tC^P6O
zP(cFuBnQGjhX(^LJ(^rVe4-_Vk*3PkBCj!?SsULdmVr0cGJM^=?8b0^DuOFq>0*yA
zk1g|C7n%pMS0A8@Aintd$fvRbH?SNdRaFrfoAJ=NoX)G5Gr}3-$^IGF+eI&t{I-GT
zp=1fj)2|*ur1Td)+s&w%p#E6tDXX3YYOC{HGHLiCvv?!%%3DO$B$>A}aC;8D0Ef#b
z{7NNqC8j+%1n95zq8|hFY`afAB4E)w_&7?oqG0IPJZv)lr{MT}>9p?}Y`=n+^CZ6E
zKkjIXPub5!82(B-O2xQojW^P(#Q*;ETpEr^+Wa=qDJ9_k=Wm@fZB6?b(u?LUzX(}+
zE6Oyapd<Pnn%^T*29yI$_#2T8ky75p(qWs)ooqKI2gN`dZpK3Y<kOCF-bmb>G$HC&
z&;oa*ALoyIxVvB2cm_N&h&{3ZTuU|aBrJlGOLtZc3<wB41_%hv|2W21e=t+(=n#Nn
zm*Oar0&(6b5;<nAAtYiLGCv|A6tP{9nAYT<*AAoG1mp_)ZWYNA(fAdZl+LgUxhajH
zBMP2AH!EkqQueuCEuY=Gn~D5i1=u<sj%R7VeIK^r69n!S%t35NNg(Fcnjq#?iuTuC
zyyEflYj(Y9WXQU}=QW)&f-zt2L<9i?G8jgUJCxqv39bRXa)Z<AYSLpgy&?>KDx)<{
z27@)~GtQF@%6B@w3emrGe?Cv_{iC@a#YO8~OyGRIvp@%RRKC?fclXMP*6GzB<W-|f
z1HB&QMc+Ib?@<fAbwIxv{Jg*T<>FO<w|z4X_0d^ajD|Sz3Z?D`jadD{q(TEoFqiL>
z5U4QK?~>AR>?KF@I;|(rx(rKxdT9-k-anYS+#S#e1SzKPslK!Z&r8iomPsWG#>`Ld
zJ<#+8GFHE!^wsXt(s=CGfVz5K+FHYP5T0E*?0A-z*lNBf)${Y`>Gwc@?j5{Q|6;Bl
zkHG1%r$r&O!N^><8AEL+=y(P$7E6hd=>BZ4ZZ9ukJ2*~HR4KGvUR~MUOe$d>E5UK3
z*~O2LK4AnED}4t1Fs$JgvPa*O+WeCji_cn1@Tv7XQ6l@($F1K%{E$!naeX)`bfCG>
z8iD<%_M6aeD?a-(Qqu61&fzQqC(E8ksa%CulMnPvR35d{<`VsmaH<C2uc@|>yzF+B
zF6a@1<cQrSK@^T2Jz<j^!(U`lVrtN6^K1{@&|Y%V?lh(s<qUgEfNklI&6tUgpAb*a
z_+C-rQUGf}bnsy~!Ygj~JcS);J7o!ttkA^>$CT0xGVjofcct4SyxA40uQ`b#9kI)&
z?B67-12X-$v#Im4CVUGZHXvPWwuspJ610ITG*A4xMoRVXJl5xbk;OL(;}=+$9?H`b
z>u2~yd~gFZ*V}-Q0K6E@p}mtsri&%Zep?ZrPJmv`Qo1>94Lo||Yl)nqwHXEbe)!g(
zo`w|LU@H14VvmBjjkl~=(?b{w^G$~q_G(HL`>|aQR%}A64mv0xGHa`S8!*Wb*eB}`
zZh)&rkjLK!Rqar)UH)fM<&h&@v*YyOr!Xk2OOMV%$S2mCRdJxKO1RL7xP_Assw)bb
z9$sQ30bapFfYTS`i1PihJZYA#0AWNmp>x(;C!?}kZG7Aq?zp!B+gGyJ^FrXQ0E<>2
zCjqZ(wDs-$#pVYP3NGA=en<@_uz!FjFvn1&w1_Igvqs_sL>ExMbcGx4X5f%`Wrri@
z{&vDs)V!rd=pS<gKlbfhp}ufon^L`I$St3=B`fTo6?X~-5*!da$WSC=wN0h_b|&|p
zL8tjMJDRM>?G(ri<ha&~1a}iabvy_b$vscbC%Y*}zodb|0`?CGVC9w*d$a$bIvm)g
zxfr>cfwPSg(w<8P_6=Qj`qBC7_XNE}1_5>+GBjpURPmvTNE7)~r)Y>ZZecMS7Ro2`
z0}nC_GYo3O7j|Wux?6-LFZs%1IV0H`f`l9or-8y0=5VGzjPqO2cd$RRHJIY06Cnh-
ztg@Pn1OeY=W`1Mv3`Ti6!@QIT{qcC*&vptnX4Pt1O|dWv8u2s|(CkV`)vBjAC_U5`
zCw1f&c4o;LbBSp0=*q<rKWROphY%8*dT*+-xv<)}6rSe7#pa+C2sRvc#pf}_5pS#>
z3Y^horBAnR)u=3t?!}e}14%K>^562K!)Vy6r~v({5{t#iRh8WIL|U9H6H97qX09xp
zjb0IJ^9Lqxop<-P*VA0By@In*5dq8Pr3bTPu|ArID*4tWM7w+mjit0PgmwLV4&2PW
z3MnIzbdR`3tPqtUICEuAH^MR$K_u8~-U2=N1)R=l>zhygus44>6V^6nJFbW-`^)f}
zI&h$FK<SfuVxz$9jz$%JfEvVgm?oA_vk80Mb*vtU&mY6DKMPelC~6k4d~PHleiT=i
z9i`)yHZ|VLG@A>)Mo*x?2`0npTD~jRd}5G~-h8=w<geTkn^ei*h^P_#kt4Dk-Ig(P
zw7emsMnh4haOAFEvCI*}Q6rgiCIEj<0mLdYm1>L#Y-G+a^C?d>OzsVl7BFAaM==(H
zR;ARWa^C3J)`p~_&FRsxt|@e+M&!84`eq)@aO9yBj8iifJv0xVW4F&N-(#E=k`AwJ
z3EFXWcpsRlB%l<ouYWjr+SUt7L1F}F&JAqs2YnGI@EauMTs3Lx>_0Vdu`0G(11F7(
zsl~*@XP{jS@?M#<a*IJCG;!^-k0mpcYSL3TA`mO-osDqvZe)rvFyj`CZ>ec~%Pr~h
z2`M*lIQaolzWN&;hkR2*<=!ORL(>YUMxOzj(60rQfr#wTrkLO!t{h<Ixt`{;>~qg%
zv$R}0IqVIg1v|YRu9w7RN&Uh7z$ijV=3U_M(sa`ZF=SIg$uY|=NdC-@%HtkUSEqJv
zg|c}mKTCM=Z8Y<XhcneSe|&PEGL?KEjv?$97<=EoEY%e)Y^wY7E2xeqEUPM20hy+h
zOBop<mL$3-WOlS|^wIV?j-e=QOSa4yQ;&3&vJ^e`I9~INys-f+JG)*Muyc444Xj{c
zOq>msFQu7k{VrXtL^!Cts-eb@*v0B3M#3A7JE*)MeW1cfFqz~^S6OXFOIP&iL;Vpy
z4dWKsw_1Wn%Y;eW1YOfeP_r1s4*p1C(iDG_hrr~-I%kA>ErxnMWRYu{IcG{sAW;*t
z9T|i4bI*g)FXPpKM@~!@a7LDVVGqF}C@mePD$ai|I>73B+9!Ks7W$pw;$W1B%-rb;
zJ*-q&ljb=&41dJ^*A0)7>Wa@khGZ;q1fL(2qW=|38j43mTl_;`PEEw07VKY%71l6p
z@F|jp88XEnm1p~<5c*cVXvKlj0{THF=n3sU7g>Ki&(ErR;!KSmfH=?49R5(|c_*xw
z4$jhCJ1gWT6-g5EV)Ahg?Nw=}`iCyQ6@0DqUb%AZEM^C#?B-@Hmw?LhJ^^VU>&phJ
zlB!n5&>I>@sndh~v$2I2Ue23F?0!0}+9H~jg7E`?CS_ERu75^jSwm%!FTAegT`6s7
z^$|%sj2?8wtPQR>@D3sA0-<U}>M-g-vL@47YCnxdvd|1mPymvk!j5W1jHnVB<xFe8
zIcRoD<goMv8Qu{5p3F6>&F-0R5e-vs`@u8a5GKdv`LF7uCfKncI4+??Z4iG@AxuX7
z6+@nP^TZ5HX#<H$*7$uZ^GJ)1l2_$4(ITNpbx11}-7Un19g4X?I6t&yby7^z8u_JG
z`AC$r&O%j3{*}u^#Roz?ZomEGRIFtrtzs00Z+Nf!0r=n1VG8UzPD-gMYD*Z0J`6&L
zrB#|AC<q8P<bMa={~UKhf1y&~g@^z<xK%_nv}iSIi1qs-80FZc5i6BP&}HzO@{J-o
zI{J0{72ps7Gh2!++v_Y$aLUWV<6RoTK080Fh4;pFyM?s}`1*Q*Fv3rOA4$qE<`y;<
z4~JsWUr|mx$PNNub+==}Qcuv-yK4?0!BQC|{mR!>*z(!y+-KJ3+Ku0M90BTY{SC^{
z&y2#RZPjfX_PE<<>XwGp;g4&wcXsQ0T&XTi(^f+}4qSFH1%^GYi+!rJo~t#ChTeAX
zmR0w(iODzQOL+b&{1OqTh*psAb;wT*drr^LKdN?c?HJ*gJl+%kEH&48&S{s28P=%p
z7*?(xFW_RYxJxxILS!kdLIJYu@p#mnQ(?moGD1)AxQd66X6b*KN?o&e`u9#N4wu8%
z^Gw#G!@|>c740RXziOR=tdbkqf(v~wS_N^CS^1hN-N4{Dww1lvSWcBTX*&9}Cz|s@
z*{O@jZ4RVHq19(HC9xSBZI0M)E;daza+Q*zayrX~N5H4xJ33BD4gn5Ka^Hj{995z4
zzm#Eo?ntC$q1a?)dD$qaC_M{NW!5R!vVZ(XQqS67xR3KP?rA1^+s3M$60WRTVHeTH
z6BJO$_jVx0<q=4oQ4^4&LjvZ?IFywiS^=+kIsr#`i;VVi*)oB%BBriVjqoaV2E?pE
z@XMJ$e#;GIWlvg=J_03_gz4T2CA}FlK-d#*_Y;iHV=RMMPp?H!FNNqW-KS|}te|O%
zX=X|Fk9k;c=4O1}iwo|p(I{gB7b!nXILr~V^6wx73`=LnKrWu#mjK^!-u;_MJqiVy
zI}_iQp3zGd=f-(%^bDpdj{*U0@S?aksQ)+FMid4y$fG+bLIVL2r3V2a`af?IA!S_z
z4w$_CLqZInLy9sX^Cv^7Ng5gjJ_scpQs*DJx3q-C!z^yfg19bvM*HgOQnbEZU0QoF
zdK$RAc-@Ll$Et(J%3uFw2SZF<oj1YfSviVH(Se<D#?ANbUnlv#>EGPXy}XK_&x597
zt(o6ArN8vZX0?~(lFGHRtHP{gO0y^$iU6Xt2e&v&ugLxfsl;GD)nf~3R^ACqSFLQ<
zV7`cXgry((wDMJB55a6<Cvg5*V@E&gp_hK?RXM9Cmb<zqULQcPsE{hc9a$%h#e|?8
zp9vcb$%gzMm_BsxVxuk9=8liQs|H!K>D4J;13$z6pupC{-F+wpToW%k1qKjUS^$Mo
zN3@}T!ZdpiV7<a`6mgu8))0n;&aR0X#=P(j$>rkNvqP3KbpEn|9aB;@V;gMS1iSb@
zwyD7!5mfj)q+4jE1dq3H`sEKgrVqk|y8{_vmn8bMOi873!rmnu5S=1=-DFx+Oj)Hi
zx?~ToiJqOrvSou?RVALltvMADodC7BOg7pOyc4m&6yd(qIuV5?dYUpYzpTe!BuWKi
zpTg(JHBYzO&X1e{5o|ZVU-X5e?<}mh=|eMY{ldm>V3NsOGwyxO2h)l#)rH@BI*TN;
z`yW<tZkAtgD1K4rH^*7E7L8y2DKR)GUqND5p=KRL(^>26bMSp=k6C4Ja{xB}s`dNp
zE+41IwEwo>7*PA|7v-F#jLN>h#a`Er9_86!fwPl{6yWR|fh?c%qc44uP~Ocm2V*(*
zICMpS*&aJjxutxKC0Tm8+FBz;3;R^=ajXQUB*nTN*Lb;mruQ<L?J}Py63aFL_JrF3
zuKjS?Xwj{ufizn|oPl*svKX+?myF1gv1i#2Pp%t_6Frc|49o-M$q1U(SoF1?czk~K
zQB+{`_(7#~5HDJ@$p0t9X4Bnjw_4k=Gtm&qcw$d~4o6S;S}fQ;i|ux0)${W9g+C7d
zoMy9g)h9D&t#es1s#qQ_(oec>HUE<&=I7pZ@F-O*VMkJbI#FOrBM8`QEL5Uy=q5e2
z_BwVH%c0^uIWO0*_qD;0jlPoA@sI7BPwOr-mrp7y`|EF)j;$GYdOtEPFRAKyUuUZS
z(N4)*6R*ux8s@pMdC*TP?Hx`Zh{{Ser;clg&}CXriXZCr2A!wIoh;j=_eq3_%n7V}
za?{KhXg2cXPpKHc90t6=`>s@QF-DNcTJRvLTS)E2FTb+og(wTV7?$kI?QZYgVBn)&
zdpJf@tZ{j>B;<<gei3eS+J#ghUE;%Jmd7Pk8%UGHJG8~c^XJ5t4rPt~H~LSUt)e@q
z%yI(@ouv9NKR5?@vcOt632S~0Yt3FWCmv2gPT|mGKc-q%RRCXu?Cj;w26j{76<LJf
zaS8h@vUzynu#YGS<gh$GHq+;%-9o4&y&kK|Wm^q<pRv}g+zU;U%KoOgxhXnt*?y!Q
z{V^AU0u#?=E3&#0wH*19Mnn~;N$z?E8?Rl9>MVHiPl_U&KlqBT)$ic+M0uUQWK|N1
zCMl~@o|}!!7yyT%7p#G4?T^Azxt=D(KP{tyx^lD_(q&|zNFgO%!i%7T`>mUuU^FeR
zHP&uClWgXm6iXgI8*DEA!O&X#X(zdrNctF{T#pyax16EZ5Lt5Z=RtAja!x+0Z31U8
zjfaky?W)wzd+66$L>o`n;DISQNs09g{GAv%8q2k>2n8q)O^M}=5r#^WR^=se#WSCt
zQ`7E1w4qdChz4r@v6hgR?nsaE7pg2<I`;}n^@4MI6vCedZ=C;ol}^bQ*dx&&8nb-&
z3)#xA-8T2gcffMYzDDo_+}wz+P8h>B6<gZ&R)|4Ts?jXVZVoqNhN_k%xHg&3BJR#@
zW~R&|0R@=eu%3D?zM3tcN^a`0bU8Qi)Uc&dq-Yp9jKcw-U#_Ld-XE55mxGO64=eaR
z!|?ouRtds{6xA*X*ir?L8T2|6t2X}m%@CA-7hu;HIu^0Tlxp+QjjALKeWuRI>~+i5
zcTTbBQ2ghUbC-PV(@xvIR(a>Kh?{%YAsMV#4gt1nxBF?$FZ2~nFLKMS!aK=(`WllA
zHS<_7ugqKw!#0aUtQwd#A$8|kPN3Af?Tkn)dHF?_?r#X68Wj;|$aw)Wj2Dkw{6)*^
zZfy!TWwh=%g~ECDCy1s8tTgWCi}F1BvTJ9p3H6IFq&zn#3FjZoecA_L_bxGWgeQup
zAAs~1IPCnI@H>g|6Lp^Bk)mjrA3_qD4(D(65}l=2RzF-8@h>|Aq!2K-qxt(Q9w7c^
z;gtx`I+=gKOl;h=#f<B(e8}^YI_Y_F$m<_@mU7iP@qM+(yD7oUVh}K##GPwk9D0yd
zeHhMzVMULpykwfv+lU+)mgprk!<ah^1r7%w_Qqy@;J2ghF_eBcu1B=+{UtO=Ex9lZ
zTr$(@oW060(mHv6jhqAHt9(%I%Q?HEL?>zSgw-V*YT~2_nnSz|!9hIxFb{~dKB!{H
zSi??dnmr@%(1w^Be=*Jz5bZeofEKKN&@@uHUMFr-DHS!pb1I&;x9*${bmg6=2I4Zt
zHb5LSvojY7ubCNGhp)=95jQ00sMAC{IZdAFsN!lAVQDeiec^HAu=8);2AKqNTT!&E
zo+FAR`!A1#T6w@0A+o%&*yzkvxsrqbrfVTG+@z8l4+mRi@j<&)U9n6L>uZoezW>qS
zA<uWB>4YfO;_9dQSyEYpkWnsk0IY}Nr2m(q<?iJ&^0JJY*WJVZ3B6DY<FXJr8Go@r
z6CZy0n;pNAl$k|qKz7;}tzyFUzN($R$VjbqGJYnWSFqb~_EE~`kN>l@KuQjLgY-@g
z4=$uai6^)A5+~^TvLdvhgfd+y?@+tRE^AJabamheJFnpA#O*5_B%s=t8<;?I;qJ}j
z&g-9?hbwWEez-!GIhqpB>nFvyi{>Yv>dPU=)qXnr;3v-cd`l}BV?6!v{|cHDOx@IG
z;TSiQQ(8=vlH^rCEaZ@Yw}?4#a_Qvx=}BJuxACxm(E7tP4<LzOM5%&sPL0AD{=s;s
z$R415QgAo#{smDow(OHv45*wK-Zi*?A$()F*V<y2E!TYT<^hcHA7K5-ZMT_!rB5`;
z|9vWN^0~I6awJfJRvcCAeNZ=j7mVNot7n9dih18do*-eAieGXMiY-4y>hki^jU@8A
zUS|4tTLd)gr@T|F$1eQXPY%fXb7u}(>&9gsd3It^B{W#6F2_g40cgo1^)@-xO&R5X
z>qKon+Nvp!4v?-rGQu#M_J2v+3e+?N-WbgPQWf`ZL{Xd9KO^s{uIHT<vv%?Nh+;B}
zmyBo-Ds%q}cQg+!oZgz$`xg$^mZZUJf3!&})t~fQTjTmEq}n-f2FtW>J6~@d=mc7i
z+##ya1p+ZHEL<ks3xMG;xOBNv36AC^Vp3h8`CZjBX4sayH7_@oJq-ndaT`jqB@IRP
zv!WtzH@kF&Wb?7eR`V`9dzcL0t|&Wer_hFfyyTy^`=Yg*D>mi%3C>g5V#yZt*jMv(
zc{m*Y;7v*sjVZ-3mBuaT{$g+^sbs8Rp7BU%Ypi+c%JxtC4O}|9pkF-p-}F{Z7-+45
zDaJQx&CNR)8x~0Yf&M|-1rw%KW3ScjWmKH%J1fBxUp(;F%E+w!U470e_3%+U_q7~P
zJm9VSWmZ->K`NfswW(|~fGdMQ!K2z%k-XS?Bh`zrjZDyBMu74Fb4q^A=j6+Vg@{Wc
zPRd5Vy*-RS4p1OE-&8f^Fo}^yDj$rb+^>``iDy%t)^pHSV=En5B5~*|32#VkH6S%9
zxgIbsG+|{-$v7mhOww#v-ejaS>u(9KV9_*X!AY#N*LXIxor9h<byy@5cbGEZK3=io
zT2V8>Dv%aie@+??X6@Et=xz>6ev9U>6Pn$g4^!}w2Z%Kpqpp+M%mk~?GE-jL&0xLC
zy(`*|&gm#mLeoRU8IU?Ujsv=;a<uB2wOxxbt+x_CGPXzy#@rDRkgcBVuX$j~bAGRw
zPYots=o?hh?dXy^E>b*URmsCl+r?%xcS1BVF*rP}XRR%MO_C!a9J^fOe>U;Y&3aj3
zX`3?i12*^W_|D@VEYR;h&b^s#Kd;JMNbZ#*x8*ZXm(jgw3!jyeHo14Zq!@_Q`V;Dv
zKik~!-&%xx`F|l^z2A92aCt4x*I|_oMH9oeqsQgQDgI0j2p!W@BOtCTK8Jp#txi}7
z9kz);EX-2~XmxF5kyAa@n_$YYP^Hd4UPQ>O0-U^-pw1*n{*kdX`Jhz6{!W=V8a$0S
z9mYboj#o)!d$gs6vf8I$OVOdZu7L5%)Vo0NhN`SwrQFhP3y4iXe2uV@(G{N{yjNG(
zKvcN{k@pXkxyB~9<aVnCIiZ=*k!Q8~L1tKaxVd|op5jWsB}Nz|CZHq!epa%JQd;)N
z4E$LOX+w8o^~cMe4a_enR1CKHIa{i@H>ucR(uPSZ7{~sC=lQtz&V(^A^HppuN!@B4
zS>B=kb14>M-sR>{`teApuHlca6YXs6&sRvRV;9G!XI08CHS~M$=%T~g5Xt~$exVk`
zWP^*0h{W%`>K{BktGr@+?ZP}2t0&smjKEVw@3=!rSjw5$gzlx`{dEajg$A58m|Okx
zG8@BTPODSk@iqLbS*6>FdVqk}KKHuAHb0UJNnPm!(XO{zg--&@#!niF4T!dGVdNif
z3_&r^3+rfQuV^8}2U?bkI5Ng*;&G>(O4&M<86GNxZK{IgKNbRfpg>+32I>(h`T&uv
zUN{PRP&onFj$tn1+Yh|0AF330en{b~R+#i9^QIbl9fBv>pN|k&IL2W~j7xbkPyTL^
z*TFONZUS2f3<j5d>3w3)fdzr?)Yg;(s|||=aWZV(nkDaACGSxNCF>XLJSZ=W@?$*`
z#sUftY&KqTV+l@2AP5$P-k^N`Bme-xcWPS|5O~arUq~%(z8z87JFB|llS&h>a>Som
zC34(_uDViE!H2jI3<@d+F)LYhY)hoW6)i=9u~lM*WH?hI(yA$X<G=8N1HS1Fvj49Y
zr{!e0ILA0423drY%0DfXJI9?mv)P9Sb^{}Ddi1|;33N^#;xwZ1s;uEy?|&@^T31A4
z1v}0pzH#c>#ip}yYld3RAv#1+sBt<)V_9c4(SN9Fn#$}_F}A-}P>N+8io}I3mh!}>
z*~*N}ZF4Zergb;`R_g49>ZtTCaEsCHiFb(V{9c@X0`YV2O<Utuc)<>^@c6~LXg2AE
zhA=a~!ALnP6aO9XOC^X15(1T)3!1lNXBEVj5s*G|Wm4YBPV`EOhU&)tTI9-KoLI-U
zFI@adu6{w$dvT(zu*#aW*4F=i=!7`P!?hZy(9iL;Z^De3?AW`-gYTPALhrZ*K2|3_
zfz;6xQN9?|;#_U=4t^uS2VkQ8$|?Ub5CgKOj#Ni5j|(zX>x#K(h7LgDP-QHwok~-I
zOu9rn%y97qrtKdG=ep)4MKF=TY9^n6CugQ3#G2yx;{))hvlxZGE~rzZ$qEHy-<GG^
zCw~Hee9AnIJK5!W2KGioRF>8?pU#G;bwufgSN6?*BeA!7N3RZEh{xS>>-G1!C(e1^
zzd#;39~PE_wFX3Tv;zo>5cc=md{Q}(Rb?37{;YPtAUGZo7j*yHfGH|TOVR#4ACaM2
z;1R0hO(Gl}+0gm9Bo}e@lW)J2OU4nukOTV<IRWfJ?LxQ}Cs$wH=@pn;(E!pGh(4PT
zCSf?oD0HK(b<eq@2#T{&XH0pqKhi2e@F&60q&GZT0!VOz3O!(?fv9x_9?Jl!@ic&&
zvAovwm9zWE2KtEoa+tIGL>KshHy7u)tLH^9@QI-jAnDBp(|J8&{fKu=_97$v&F67Z
zq+QsJ=gUx3_h_%=+q47msQ*Ub=gMzoSa@S<C&>2>`Y9Cj*@Op4plTc!jDhu51nSGI
z^sfZ(4=yzlR}kP2rcHRzAY9@T7f`z>fdCU0zibx^gVg&fMkcl)-0bRyWe12bT0}<@
z^h(RgGqS|1y#M;mER;8!CVmX!j=rfNa6>#_^j{^C+SxGhbSJ_a0O|ae!ZxiQCN2qA
zKs_Z#Zy|9BOw6x{0*APNm$6tYVG2F$K~JNZ!6>}gJ_NLRYhcIsxY1z~)mt#Yl0pvC
zO8#Nod;iow5{B*rUn(0WnN_~~M4|guwfkT(xv;z)olmj=f=aH<b>#Y|#f_*d1H!o(
z!E<ZksS#Iaz>XNxKxth9w1oRr0+1laQceWfgi8z`YS#uzg#s9-QlTT7y2O^^M1PZx
z3YS7iegfp6Cs0-ixlG93(JW4wuE7)mfihw}G~Uue{Xb+#F!BkDWs#*cHX^%(We}3%
zT%^;m&Juw{hLp^6eyM}J({luCL_$7iRFA6^8B!v|B9P{$42F>|M`4Z_yA{kK()WcM
zu#xAZWG%QtiANfX?@+QQOtbU;Avr*_>Yu0C2>=u}zhH9VLp6M>fS&yp*-7}yo8ZWB
z{h>ce@HgV?^HgwRThCYnHt{Py0MS=Ja{nIj5%z;0S@?nGQ`z`*EVs&WWNwbzlk`(t
zxDSc)$dD+4G6N(p?K>iEKXIk>GlGKTH{08Wvreh<CAf?TJ>nHhh%tgpp&8db4*FLN
zETA@<$V=I7S^_KxvYv$Em4S{gO>(J#(Wf;Y%(NeECoG3n+o;d~Bjme-4dldKukd`S
zRVAnKxOGjWc;L#OL{*BDEA8T=zL8^`J=2N)d&E#?OMUqk&9j_`GX*A<zR<6(@2+L7
z@1$o_@SdQ`j0ne14Py8~N$N(bF^OEP4yf&4{)E?@3uqgKCl~oc9JGOl%*Hj(+(E%G
z61_ReO+5gw$@3rF7*zTt16$e`KZAyGV)!rJwJ!yKjS4(jVys!9BpagJUf1M>9?V-G
zdA5QQ#(_Eb^+wDkDiZ6RXL`fck|rVy%)BVv;dvY#`msZ}<bv)Vrqcf?ms>{x5fmd!
zInmWSxvRgXbJ{unxAi*7=Lt&7_e0B#8M5a=Ad0yX#0rvMacnKnXgh>4<kzFZZ+q2=
zSI@wc!e-hJ!WKWxZcvCb6r;@e6kZ)gU~$!}pY}zm1`BBiO&Cp>iiRq<&wit93n!&p
zeq~-o37qf)L{KJo3!{l9l9AQb;&>)^-QO4RhG>j`rBlJ09~cbfNMR_~pJD1$UzcGp
zOEGTzz01j$=-kLC+O$r8B|VzBotz}sj(rUGOa7PDYwX~9Tum^sW^xjjoncxSz;kqz
z$Pz$Ze|sBCTjk7oM&`b5g2mFtuTx>xl{dj<a{IGbs&Xr_Lnl~=L#C-3f_=262-*SN
zks}N?-dkm-=nWk~RaP*30U<!1%uw|>*U$L%y-xeQL~|i>KzdUHeep-Yd@}p&L*ig<
zgg__3l9T=nbM3bw0Sq&Z2*FA)P~sx0h634BXz0AxV69cED7QGTbK3?P?MENkiy-mV
zZ1xV5ry3zIpy>xmThBL0Q!g+Wz@#?6fY<EaoNR>vzmEczs(rcujrfCN=^!iWQ6$EM
zaCnRThqt~gI-&6v@KZ78unqgv9j6-%TOxpbV`tK{KaoBbhc}$h+rK)5h<YjQ73BXl
zpM^mR_u6^E|NA0I`x69&;(xqnK0Q2uo^<*EVpO`Z33U{viEa`@8YY#iRIEJ;osRdP
zL>|bT6wY*t6st-4$e99+Egb#3ip+ERbve08G@Ref&hP)qB&?>B94<kOj@Q1fJNzg4
zo+oqf&lQ9L@Vi_Bum@NgI>?eq5i3k;dOuU#!y-@+&5>~!FZik=z4&4|YHy=~!F254
zQAOTZr26}Nc7jzgJ;V~+9ry#?7Z0o*;|Q)k+@a^87lC}}1C)S))f5tk+lMNqw>vh(
z`A9E~5m#b9!ZDBltf7QIuMh+VheCoD7nCFhuzThlhA?|8NCt3w?oWW|NDin&&eDU6
zwH`aY=<IrWwJm6AY&rFqmNW+-KZ@4)eR-L6R~2;>))lpWG?{fda=-auXYp1WIPu&3
zwK|t(Qiqvc@<;1_W#ALDJ}bR;3&v4$9rP)eAg`-~iCte`O^MY+SaP!w%~+{{1tMo`
zbp?T%ENs|mHP)Lsxno=nWL&qizR+!Ib=9i%4=B@(Umf$|7!WVxkD%hfRjvxV`Co<;
zG*g4QG_>;RE{3V_DOblu$GYm&!+}%>G*yO{-|V9GYG|bH2JIU2iO}ZvY>}Fl%1!OE
zZFsirH^$G>BDIy`8;R?lZl|uu@qWj2T5}((RG``6*05AWsVVa2Iu>!F5U>~7_Tlv{
zt=Dpgm~0QVa5mxta+fUt)I0gToeEm9eJX{yYZ~3sLR&nCuyuFWuiDIVJ+-lwViO(E
zH+@Rg$&GLueMR$*K8kOl>+aF84Hss5p+dZ8hbW$=bWNIk0paB!qEK$xIm5{*^ad&(
zgtA&gb&6FwaaR2G&+L+Pp>t^LrG*-B&Hv;-s(h0QTuYWdnUObu8LRSZoAVd7SJ;%$
zh%V?58mD~3G2X<$H7I)@x?lmbeeSY7X~QiE`dfQ5&K^FB#9e!6!@d9vrSt!);@ZQZ
zO#84N5yH$kjm9X4iY#f+U`FKhg=x*FiDoUeu1O5LcC2w&$~5hKB9ZnH+8BpbTGh5T
zi_nfmyQY$v<uZ;l&g@c%q;+Vgch$G^zJI*;eLwf}d#~$x|9P(K{XKVada<9+sIfYB
zKAm@-U=yZ;64wg$H}Z;yL)GoR=u$~I;@cnfU5TMi>Qh%ildbR7T;7TKPxS<Ob4E3(
znTaa+H!rSqa0vbx%SAld=m88TC+A_c(usssUb>s#vhKR|u<i0Ko**prU~S9yhY2+1
zPX%J@>up`qi1PufMa(tNCjRbllakshQgn1)a8OO-j8W&aBc_#q1hKDF5-X$h`!CeT
z+c#Ial~fDsGAenv7~f@!icm(~)a3OKi((=^zcOb^<lLk;-tgW3Xq;u|w+kECe)CSK
zcriMg^rmc3Yr@_+rl3D>qH$#DVciGXslUwTd$gt{7)<evvuvMrg(Ti)md>&#a`&Lp
ze%AnL0#U?lAl8vUkv$n>bxH*`qOujO0HZkPWZnE0;}0DSEu1O!hg-d9#{&#B1Dm)L
zvN%r^hdEt1vR<4zwshg*0_BNrDWjo65be1&_82SW8#iKWs7>TCjUT;-K~*NxpG2P%
zovXUo@S|fMGudVSRQrP}J3-Wxq;4xIxJJC|Y#TQBr>pwfy*%=`EUNE*dr-Y?9y9xK
zmh1zS@z{^|UL}v**LNYY!?1<k__7o+p+4(1NBmVoECA0-KiaC}AV_?C+7J`NK6$84
zBBqrmc2Of6i%(I;M!$`SXjC=j*Jb1-z1V$vmVAv$?q7A-UNUbIjPc&$&dCZYdrovY
zYk!tOxHv@D?D9y!F}6RcP($xyne%TppYSv>qIRPTvr!gNXzE{%=-`oKclPrfMKwn`
zUwPeIvLcxkIV>(SZ<gIk>-SeBo-yw~{p!<&_}eELG?wxp<p7ueiB^ha`u<BZpHY)>
zee-V59%@<kWnQ!o$=ScYaN1eg<h0xJ+n{>BtB+Z&Xs=O(@P$}v_qy1m=+`!~r^aT>
zY+l?+6(L-=<Qwd6r+5D1gjtj||7^9yk+4?S=Ggr8A1DHM$HUa2z2LxvD6=8#&qY;Z
zt8)xOz>P%m4ScfAYR8;f<Dr$LNuTmbgXDXglYV1=E&7Wn5{y|K*%IZ{6JLH|Dmg(}
znR2;>9dyVw)@(;v{|nO#lAPI1xDHXMYt~-BGiP&9y2OQsYdh7-Q1(vL<<EACIT8XT
z1qBbB|I*^xWzq`9+Gz$W)b?o0;B_{07?)m#_X&4NiqZ!@dMI95k-D2y@#kI!654RD
zYjUTZNp<Jd!Zn^%3j)3$jIWM4-Qun*WT<1+ge_~RzCUVOk8MJ|QtuNIQhY1uMB$;h
zMYbE)LIT&;DS?{%MXv&WEx~h?bBn#UB?S0m9+k!hKZsX-kfe7B^B<*@su?}#wF4VB
z?;H|rx{AeM@(Z*>$u6W0nxVn-qh=nwuRk}{d!uACozccRGx6~xZQ;=#JCE?OuA@;4
zadp$sm}jfgW4?La(pb!3f0B=HUI{5A4b$2rsB|ZGb?3@CTA{|zBf07pYpQ$NM<dsE
z+)HCvvfx}7?%s(mGoXS5m%y~{D7-?vfIM*E-Br$2)`nbbeI(JuN@9us|G8x)CDV5<
z`Lmq6gxN5v!A!|MaD3-`+9x>({C6Srv6%_{rVkCndT=1nS}qyEf}Wjtg<e&Ks@rVk
zCTmzRh=zK-IH2i_l=1F$2220Iw|x(Vy@q&&jtGSk7d?<UZ;dm(=6HqQ(+WnK_lD6C
z*aagnyAQvy-@DtV52PW8=n|p@r}`}M3VRKOLe0lFjJnWp7!6O#BVRO5AyO^F7?H{&
z(VFk3lyh;>$e{ng7Wgz$7itYy0sWW_$qld);iUm85GBH)fk3b=2|5mvflm?~inoVo
zDH_%e;y`DzoNj|NgZ`U%a9(N*=~8!q<HF%wJbappLVVp)97sNgNZK+YXiAqubI6nt
zz^x1f3S?e@nzaE{ASzP}l7_5+M-C#bWf{R<85&j(;XpwyA}tJ2fp5MXx<Tp~8p2^5
zVDpg?+d?DwY}g9Kl_K<Dg(`F?Hb7jFBRG&${$9Q_LIUX(@2T%~4C1mM#ex5Qw;}5w
z-+yc6zt@a=dt*=&%0@|mbr+$oV`R`;g+R{T?MS63V>qy0Etkxo#`r!!{|(NyT0;5=
z8nVZ6AiM+SjMG8J@6c4_f-KXd_}{My?Se1GWP|@wROFpD^5_lu?I%CBzpwi(`x~xh
B8dv}T

delta 17845
zcmV)CK*GO}(F4QI1F(Jx4W$DjNjn4p0N4ir06~)x5+0MO2`GQvQyWzj|J`gh3(E#l
zNGO!HfVMRRN~%`0q^)g%XlN*vP!O#;m*h5VyX@j-1N|HN;8S1vqEAj=eCdn`)tUB9
zXZjcT^`bL6qvL}g<Hw9Mj^|#&N2h?(F`1lu_ndpq?{_}-=D|N7-vjUr-ZBx#3-xHh
z2`L7p$e1Kf*5QAYiPLzo0STOunzJU(VW<Ja7%`AF@RErrUXGlZf%=%pVN{Cq2F46r
zFfh&#alCR__zWF+&o8ITJ})^Uz2x(S1>vXj%9vrOD+x!Gc_0{$Zg+6lTXG$bmoEBV
z*%y^c-mV0~Rjzv%e6eVI)yl>h;TMG)Ft8lqpR`>&IL&`>KDi5l$AavcVh9g;CF0tY
zw_S0eIzKD?Nj~e4raA8wxiiImTRzv6;b6|LFmw)!E4=CiJ4I%&axSey4zE-MIh@*!
z*P;K2Mx{xVYPLeagKA}Hj=N=1VrWU`ukuBnc14iBG?B}Uj>?=2UMk4|42=()8KOnc
zrJzAxxaEIfjw(CKV6F$35u=1qyf(%cY8fXaS9iS?yetY{mQ#Xyat*7sSoM9fJlZqq
zyasQ3>D>6p^`ck^Y|kYYZB*G})uAbQ#7)Jeb~glGz@2rPu}zBWDzo5K$tP<|meKV%
z{Swf^eq6NBioF)v&~9NLIxHMTKe6gJ@QQ^A6fA!n#u1C&n`aG7TDXKM1Jly-DwTB`
z+6?=Y)}hj;C#r5>&x;MCM4U13nuXVK*}@yRY~W3X%>U>*CB2C^K6_OZsXD!nG2RSX
zQg*0)$G3%Es<rMi9IFkILZk8W3*zmnaEl_-v&C>$otA@<d5B&i@NKtDgSW_?su;gQ
zolk$}wmPmIAgB0t!H8pWXh)p3t<)yxd~Zn^WNM9@hA}ROLYwE;<qYL=a)z{do7&c~
zOU=+lw_zN_7aE%7#L)HEEQf~HkenM@!(`u&10)a9(=6#VTH~n|uvG6dLaDxGXen(O
z;XBH!lVmG&lAn|B7pTXVXv9~9^flpue#(Cz-8iJK+qlAIYA2CHw5Qpu;k}OteSyKQ
z`kU`!PwGQxpTSIZwT4%qle~EgQBsDQBOk$-mgY|plS?ld@1iaO$x2hK4#FV$4PEx%
z64rN=-S>p_1N!hIPT(iSE=8OPZG+t)o<dTw8$=ITLu%Kn&h^n=hZc{ukec4F8s&cn
zHOkqTnd<CbL4C}0<_7eHehWv4SvaA;hXayxLSKbRv}1?wq9KIoR6?gJ-bT}){t2Qp
z?fMED@841214PiOrSSynNd8Pk{e>FyD~{nevj0gZen$p>U<7}uRE`t5Mk1f4M0K*5
zbn<D{nCwP+S(Ox1JDHTGlB$C?aL!zS)j)aC4N=Q$g0hm{@mNXgzR`KZi=*k<JFD2U
zislbCS|3r-{@$V0$7^VDJg3k?#9Vqlk0;eXFI_&!Q-<chP)h>@3IG5I2mk;8K>*RZ
zPV6iL006)S001<T5fUDgJPsUxQxZ`W|6N2E*F}j?Q}ZJ=15{A^(lk>s%0eYj)9hu1
z9o)iQT9(v*sAuZ|ot){RrZ0Qw4{E0A+!Yx_M~#Pj&OPUM&i$RU=Uxu}e*6Sr2ror=
z&?lmvFCO$)BY+^+21E>ENWe`I0{02H<-lz&?})gIVFyMWxX0B|0b?S6?qghp3lDgz
z2?0|ALJU=7s-~Lb3>9AA5`#UYCl!Xeh^i@bxs5f&SdiD!WN}CIgq&WI4VCW;M!UJL
zX2};d^sVj5oVl)OrkapV-C&SrG)*x=X*ru!2s04TjZ`pY$jP)4+%)7&MlpiZ`lgoF
z<z)BC1fvX1DaDLZ_@-`uBujj%t}%3ZeUVr4TREsHX7F?nWpHMA-Xk|J!iq`DS}GVf
z4OL4K$Uz`ePv~ieY74)ZRfxYcZpw+*vvS6&Rlqbur}xYv21j`ZZCe8j?dJd)#JHX_
z5=vO*eRLkV0-T?O1~f`|h(`h*OPIkE2~QCbFe_mW^9+sURZQi7)O1oYBt-FyQU{7<
zNQhxxKwQEC78z;-Weov$5b5@FdMV(!gk`L7YA+<TqeH+dL*W0uDMLf?oH9r2nf+pL
z(JaK2H#sFs@P+LRZ(7;jTRIZQ(sv(2QuDhnf@7$R#^#q-7<w+6w}d5qmBm<uOr@;I
zLMW+p&rrk1yf}h?o+JG6A+6#q(ddiydr!JgMid5uPq(QbnutmXYCCHx8^yD!+vYaa
zd7<2tbodnD1w&osHX>o_p>^4qGz^(Y*uB10dY2kcIbt=$FIdYNqk;~47wf@)6|nJp
z1cocL3zDR9N2Pxkw)dpi&_rvMW&Dh0@T*_}(1JFSc0S~Ph2Sr=vy)u*=TY$i_IHSo
zR+&dtWFNxHE*!miRJ%o5@~GK^G~4$LzEYR-(B-b(L*3jyTq}M3d0g6sdx!X3-m&O%
zK5g`P179KHJKXpIAAX`A2MFUA;`nXx^b?mboVbQgigIHTU8FI>`q53AjWaD&aowtj
z{XyIX>c)*nLO~-WZG~>I)4S1d2q@&?nwL)CVSWqWi&m1&#K1!gt`g%O4s$u^->Dwq
ziKc&0O9KQ7000OG0000%03-m(e&Y`S09YWC4iYDSty&3q8^?8ij|8zxaCt!zCFq1@
z9TX4Hl68`nY>}cQNW4Ullqp$~SHO~l1!CdFLKK}ij_t^a?I?C^CvlvnZkwiVn>dl2
z2$V(JN{`5`-8ShF_ek6HNRPBlPuIPYu>TAeAV5O2)35r3*_k(Q-h1<oe`Z&D<40Ft
zBcd&T{H%vo)9-oc7=5c8y|+a3`=a>+h5pb(Zu%oJ__pBsW0n5ILw`!&QR&YV`g0Fe
z(qDM!FX_7;`U3rxX#QHT{f%h;)<e7LdkX!XLVxd}I{F6>Eursw=*#qvV)~y%^Uo^%
zi-%sMe^uz;#Pe;@{JUu05zT*i=u7mU9{MkT`ft(vPdQZoK&2mg=tnf8FsaNQ+QcPg
zB>vP8Rd6Z0JoH5_Q`zldg;hx4azQCq*rRZThqlqTRMzn1O3_rQTrHk8LQ<{5UYN~`
zM6*~lOGHyAnx&#yCK{i@%N1Us@=6cw=UQxpSE;<(LnnES%6^q^QhBYQ-VCSmIu8wh
z@_Lmwc<AfAQRRAtHwjXM%8e>FDfAhIn>`%h7L{)iGBzu`Md4dj-m3C8mA9+BL*<>q
z#$7^ttIBOE-=^|zmG`K8yUKT{yjLu2SGYsreN0*~9yhFxn4U};Nv1XXj1fH*v-g=3
z@tCPc`YdzQGLp%zXwo*o$m9j-+~nSWls#s|?PyrHO%SUGdk**X9_=|b)Y%^j_V$3S
z>mL2A-V)Q}qb(uZipEFVm?}HWc+%G6_K+S+87g-&RkRQ8-{0APDil115eG|&>WQhU
zufO*|e`hFks^cJJmx_qNx{ltSp3aT|XgD<x?C$Ix95~e-?CJ`JIx({^gvA?wYnXif
zoqP8cWngm0%+XP?j}={}HQF+2>5-VxGGXb7gkiOG$w^qMVBDjR8%!Sbh72niHRDV*
ziFy8LE+*$j?t^6aZP9qt-ow;hzkmhvy*Hn-X^6?yVMbtNbyqZQ^rXg58`gk+I%Wv}
zn_)dRq+3xjc8D%}EQ%nnTF7L7m}o9&*^jf`_qvUhVKY7w9Zgxr-0YHWFRd3$l_6UX
zpXt^U&TiC*qZWx#pOG6k?3Tg)pra*fw(O6_45>lUBN1U5Qmc>^DHt)5b~Ntjsw!NI
z1n4{$HWFeIi)*qvgK^ui;(81VQc1(wJ8C#tjR>Dkjf{xYC^_B^#qrdCc)uZxtgua6
zk98UGQF|;;k`c+0_z)tQ&9DwLB~&12@D1!*mTz_!3Mp=cg;B7Oq4cKN>5v&dW7q@H
zal=g6Ipe`siZN4NZiBrkJCU*x216gmbV(FymgHuG@%%|8sgD?gR&0*{y4n=pukZnd
z4=Nl~_>jVfbIehu)pG)WvuUpLR}~OKlW|)=S738Wh^a&L+Vx~KJU25o6%G7+Cy5mB
zgmYsgkBC|@K4Jm_PwPoz`_|5QSk}^p`XV`649#jr4Lh^Q>Ne~#6Cqxn$7dNMF=%Va
z%z<AsBy*Nm$qcPRtn58~4;F#DO3=3TTAjKTiwdqKd0hD(l8ifl@)+GRtI%1Rw?ZO(
zmz+Szx|nJK58+fyw~fJ^C)O5^R^hg#=i(9@)dYl2m=<>9Ef6QmfoXAlQ3)PF8#3Y%
zadcE<1`fd1&Q9fMZZnyI;&L;YPuy#TQ8b>AnX<x$C{{p37Ks8vjz*8r1<^dA(Ff^4
zjUJ+uMh{bpsciv&6kGQ$XCNeUw?-eL^BR4Oo<Ib~Y&#K12;>r*SGY&xUb>2678A+Y
z8K%HOdgq_4LRFu_M>Ou|kj4W%sPPaV)#zDzN~25klE!!PFz_>5wCxglj7WZI13U5|
zEq_YLKPH;v8sEhyG`dV_jozR);a6dBvkauhC;1dk%mr+J*Z6MMH9jqxFk@)&h{mHl
zrf^i_d-#mTF=6-T8Rk?(1+rPGgl$9=j%#dkf@x6>czSc`jk7$f!9SrV{do%m!t8{?
z_iAi$Qe&GDR#Nz^#uJ>-_?(E$ns)(3)X3cYY)?gFvU+N>nnCoBSmwB2<4L|xH19+4
z`$u#*Gt%mRw=*&|em}h_Y`Pzno?k^8e*hEwfM`A_yz-#vJtUfkGb=s>-!6cHfR$Mz
z`*A8jVcz7T{n8M>ZTb_sl{EZ9Ctau4naX7TX?&g^VLE?wZ+}m)=YW4ODRy*lV4%-0
zG1XrPs($mVVfpnqoSihnIFkLdxG9um&n-U|`47l{bnr(|8dmglO7H~yeK7-wDwZXq
zaHT($Qy2=MMuj@lir(iyxI1HnMlaJ<jX%sE(fCn*3?3Gn4nSlq&@KU5<Hz}<NX%K-
zMTN~lIE^px$DD-EU%M{1qACNs17;@Nj-Gt*Rrm>wpX86je}e=2n|Esb6hB?SmtDH3
z2qH6o`33b{;M{mDa5@@~1or8+Zcio*97pi1Jkx6v5MXCaYsb~Ynq)eWpKnF{n)FXZ
z?Xd;o7ESu&rtMFr5(yJ(B7V>&0gnDdL*4MZH&eO+r*t!TR98ssbMRaw`7;`SLI8mT
z=)hSAt~F=mz;JbDI6g~J%w!;QI(X14AnOu;uve^4wyaP3>(?jS<ljwsU5!7<p8}i}
zL7L#c+-+~wLLj;s_n}*|CFnpNPNHIW9&Eq(bs-;&;(6@(b=_4E{(&*eoXA{DmlQp8
znGXNI-Kxc9CO;b|K^L%!!T>Lp+LQ7uU(iib%IyB<ywG`)hV2}Kh*;jWpny-xs1#~{
zbqmCdt821{{_GXnJ$@z<wUY88e+*@1o6>(d&g@+hg;78M>h7yAeq$ALRoHGkKXA+E
z$Sk-hd$Fs2<K7hR`?HSPSmeG}{4J#x%N=>nL4w<PeNfsVCF_wKy$W6_$epEmZYjK4
zi+d!*BDQw+O#prhLbfH}8_MdBw~JwaO+mWJsY>9p@O*Y$c;U)W#d~)&8Js;i^Dp^*
z0*7*zEGj~VehF4sRqSGny*K_CxeF=T^8;^lb}HF125G{kMRV?+hYktZWfNA^Mp7y8
zK~Q?ycf%rr+wgLaHQ|_<6z^eTG7izr@99SG9Q<u__?-*+Lj0<oJ4_lDPNp1xOi0I-
zBk-Z{m?6MYLI0qcv@^Xv0JziBMLwwL9Z4DDm=IOI-_l3N<qbRWo|1PyCHQ|^CaiX&
zfb>{$PCjJabSz`6L_QJJe7{LzTc$P&pwTy<&3RRUlSHmK;?}=QAhQaDW3#VWcNAH3
zeBPRTDf3?3mfdI$&WOg(nr9Gyzg<O~aeU!4%Dw6dhqX`I;`>`&u^o!f2rKJ57D_>p
z6|?Vg?h(@(*X=o071{g^le>*>qSbVam`o}sAK8>b|11%e&;%`~b2OP7--q%0^2YDS
z`2M`{2QYr1VC)sIW9WOu8<~7Q>^$*Og{KF+kI;wFegvaIDkB%3<qeI0+|)cpd`XIV
zR5F&JZ6TFzp~ui`$S~65^ilbpw_GY>*%PWtWKSq7l`1YcDxQQ2@nv{J!xWV?G+w6C
zhUUxUYVf%(Q(40_xrZB@rbxL=Dj3RV^{*yHd>4n-TOoHVRnazDOxxkS9kiZyN}IN3
zB<F0}kh5un+-`~NJtS>^5<Ov^3sk&XI@aAOttDFN^<1Hf*Qvs*;dz~^rm1q6r>N=*
zRSTO+rA<{*P8-$GZdyUNOB=MzddG$*@q>mM;pUIiQ_z)hbE#Ze-IS)9G}Rt$5PSB{
zZZ;#h9nS7Rf1ecW&n(Gpu9}{vXQZ-f`UHIvD?cTbF`YvH*{rgE(zE22pLAQfhg-`U
zuh612EpByB(~{w7svCylrBk%5$LCIyuhrGi=yOfca`=8ltKxHcSNfDRt@62QH^R_0
z&eQL6rRk>Dvf6rjMQv5ZXzg}S`HqV69hJT^pPHtdhqsrPJWs|IT9>BvpQa@*(FX6v
zG}TYjreQCnH(slMt5{NgUf)qsS1F&Bb(M>$X}tWI&yt2I&-rJbqveuj?5J$`Dyfa2
z)m6Mq0XH@K)Y2v8X=-_4=4niodT&Y7W?$KLQhjA<+R}WTdYjX9>kD+SRS^oOY1{A=
zZTId-(@wF^UEWso($wZtrs%e7t<}YaC_;#@`r0LUzKY&|qPJz*y~RHG`E6bypP5AX
zN!p0^AUu8uDR>xM-ALFzBxXM~Q3z=}fHWCIG>0&I6x2Iu7&U)49j7qeMI&?qb$=4I
zd<toLH_|bTXh!IH%zTALX`0694LSoG67(Iqm%d9DeGe<Xj|6_3#_1i3!<q!IqkDN1
zSsWmnw@`|Ix6=gg0)mMAc@}xHg?^SkjWr6i-%rocXOLkD==cd>MmhAJrO%@0f%YW!
z^gLByE<rzqUM2SO4f<*N8D!WybTfSpk`$3u*?dIL$w%}u`B=g`>GSk+R0<o|SzE^2
z=mq+Dc&Un;=ojc0k)5JQzDX4`P*$nXYK3+y^aX`~zNpZP3VlhTFDrCXSj;X!&J5Kr
z$i<TD=DHaeuN372_|0IC1(W1Vu|iuT3SFE5w$v13aQ=V=%?vhqBOQ6wsEW@=4#3<G
zKMNRYo~GTy4QblLXl}>v4*d4w*N$Ju6z#j%HBI}6y$2en=-@S3=6+yZX94m&1j@s-
z7T6|#0$c~dYq9IkA!P)AGkp~S$zYJ1SXZ#RM0|E~Q0PSm?DsT4N3f^)b#h(u9%_V5
zX*&EIX|gD~P!vtx?ra71pl%v)F!W~X2hcE!h8cu@6uKURdmo1-7icN4)ej4H1N~-C
zjXgOK+mi#aJv4;`DZ%QUbVVZclkx;9`2kgbAhL^d{@etnm+5N8pB#fyH)bxtZGCAv
z(%t0kPgBS{Q2HtjrfI0B$$M0c?{r~2T<RSTf!OM5X3QT;)A80apUYQ<$z#K%jo!P`
zbOH>=zeXo7V&&aprCzww=i*}Atu7g^(*ivauMz~kkB%Vt{Wydlz%%2c26%>0PAbZO
zVHx%tK(uzDl#ZZK`cW8TD2)eD77wB@gum{B2bO_jnqGl~01EF_^jx4Uqu1yfA~*&g
zXJ`-N?D-n~5_<grn_osx<j94buP;cy;tm9e`4#$A*eE>QNF_5+Un<iW1@v`M1E*$?
zJ+2%H1WCn`>-4&l$<JXVg1Oln#u3?n?Tw)AX}V5pfSfCwe8Ks)vj$jeG-vYVBC>1b
zVlHFq<avD&0lWm;Uqa1&1#o#eFH<(>tluoN85b^C{A==lp#hS9J(npJ#6P4aY41r)
zzCmv~c77X5L}H%sj>5t&@0heUDy;S1gSOS>JtH1v-k5l}z2h~i3^4NF6&iMb;ZYVE
zMw*0%-9GdbpF1?HHim|4+)Zed=Fk<2Uz~GKc^P(Ig@x0&XuX0<-K(gA*KkN&lY2Xu
zG054Q8wbK~$jE32#Ba*Id2vkqmfV{U$Nx9vJ;jeI`X+j1kh7hB8$CBTe@ANmT^tI8
z%U>zrTKuECin-M|B*gy(SPd`(_xvxjUL?s137KOyH>U{z01cBcFFt=Fp%d+BK4U;9
zQG_W5i)JASNpK)Q0wQpL<+Ml#cei41kCHe&P9?>p+KJN>I~`I^vK1h`IKB7k^xi`f
z$H_mtr_+@M>C5+_xt%v}{#WO{86J83;VS@Ei3JLtp<*+hsY1oG<nU}c+^yg_Dk>zo
z0?$?OJO$79;{|@aP!fO6t9TJ!?8i&|c&UPWRMbkwT3nEeFH`Yyyh6b%Rm^nBuTt@9
z+$&-4lf!G|@LCo3<8=yN@5dYbc%uq|Hz|0tiiLQKiUoM9g14zyECKGv0}3AW<LxTK
zc!!F2;$8CV-Ew%39Nz24ML#a7sKoo^{QW9EfDfw3U|7Wn9#VhtFh&)8NWo<l>v2WJ
zUAXGUhvkNk`0-H%ACsRSmy4fJ@kxBD3ZKSj6g(n1KPw?g{v19phcBr3BEF>J%lL|d
zud3LNuL;cR*xS+;X+N^Br+x2{&hDM<N4j_Sc6IL(2t-ckr}d_|o*ZcEv8`BgV1vNa
zRx_Eh^`yODkEeePfl$fzw)WnZu1I@Z4yP{5vS(jcdvA_9uYg*zsbXU+8M8MFl!Y7i
z3;0^ieoCu}#FECYbmEv{_3FpshE&pw>hb-$6_fKU(Pt0FQUXgNrZvzsVCnsFqv?#L
z4-FYsQ-?D>;LdjHu_TT1CHN~aGkmDjWJkJg4G^!+V_APd%_48tErDv6BW5;ji^UDD
zRu5Sw7wwplk`w{OGEKWJM&61c-AWn!SeUP8G#+beH4_Ov*)NUV?eGw&GHNDI6G(1Y
zTfCv?T*@{QyK|!Q09wbk5koPD>=@(cA<~i4pSO?f(^5sSbdhUc+K$DW#_7^d7i%At
z?KBg#vm$?P4h%?T=XymU;w*AsO_tJr)`+HUll+Uk_zx6vNw>G3jT){w3ck+Z=>7f0
zZV<RBTo{nTnT)OKN^+H6P{iI)9M0OTLisYLg-h7{ab~5|Ete5V!*1HQw~K3na^@Eh
zd(I_o{cO%2@`UmdZI{^^*HfuB<M=i+o$PP7EXRNTsXewHJ-JgKa&lh5Hw0FNCyr`~
zs#_+t=|&+`d(5;IHQe-`S#rKsNP$cP4~RDNOfqij{TlY7N5d15)?g#0;V9_W&_t&~
z!#D9Q`oH*4GKVH}@EHoSPIK9orwO=xkXfMN+xU)x?`rrSzE7T00_CUDF~b&E{eK)g
z4L^Ut4>kM<KUVM)4Ugid%%br_)TyTi8AJ^~!_O7`Lc=fdD-AI`MZ*wIX*hwWD)_aA
z-{7|bb3DxIlI1ua=izo2&QRr*(xJaA^xzo(ZrvViNu`Vgv&NEqzn8-w1nNDQx3X5H
zY)+)Vm~gH^f5e{zwER4xN$$=S<K<4m{#k#)Uo`v`f79@H8Qg#1nudSk8q33-%nNIg
zKvlt(f8pP9-(w2?qv3J<SD_#w#1uu8X~HMU6;YuHMfjOdH#kA`)Ob$pO(*SG!pJQW
zUsP&Bm0I|YQ+Z8P2~A*gtDa1ncBtQ=kqL${6qV<0i2e#4H?2_CCn47P&~eL5gra|J
zNyqe*5vpIDs$Wr%huz0c7*SgjQ$@8DSEGn&ny3{4Mbv3xI?}8(H$LE+n1O4Gn5l_b
zVm32U1Qjty6LTeTp3DzI1h0E2rOf#(iQ_WzT%+YXPS(wM+&r@{c{0hv*ge)C7KIxo
z)08UAEa*DV)_DVn?p&#xh=(aMsHcBgtbugGNZJ#rmcy0(@_1|@Z813)m(;jYV`MKV
zcRKQ9t?_J`dE1=gz(PG>*!k^Z_E@_pZK6uH#|vzoL{-j1VFlUHP&5~q?j=UvJJNQG
ztQdiCF$8_EaN_Pu8+afN6n8?m5UeR_p_6Log$5V(n9^W)-_vS~Ws`RJhQNPb1$C?|
zd9D_ePe*`aI9AZ~Ltbg)DZ;JUo@-tu*O7CJ=T)ZI1&tn%#cisS85EaSvpS~c#CN9B
z#Bx$vw|E@gm{;cJOuDi3F1#fxWZ9+5JC<e{LvdZ+7pxTd*M}z+T`$b~$!(=qYR0Kf
zt#wVO(KgF8>qVRCz5o`EDW890NUfNCuBn)3!&vFQE{E$L`Cf7FMSSX%ppLH+Z}#=p
zSow$)$z3IL7frW#M>Z4|^9T!=Z8}B0h*MrWXXiVschEA=$a|yX9T~o!=%C?T+l^Cc
zJx&MB$me(a*@lLLWZ=<H=nUNL9^OCXvBxWNGd%W6P27%^Wai1n>>PhKs!}#!ICa0!
zq%jNgnF$>zrBZ3z%)Y*yOqHbKzEe_P=@<5$u^!~9G2OAzi#}oP&UL9JljG!zf{JIK
z++G*8j)K=$#57N)hj_gSA8go<n<4*~1n?n<2zEkX7iUvY#d&w$T;qIq-n@qMJ$dtK
z@bjBDb&kEHH1SvPx4eIG7*j4eEc-ZCIK&Y4bJSc09KaL!TZuj#Bo{Y}d#F?uX;(*3
z7Fjw1-%bwYyGBvbHw>lO7xZP|KM?elUq)qLS)i(?&lk{oGMJh{^*FgklBY@Xfl<_Q
zXP~(}ST6V01$~VfOmD6j!Hi}lsE}GQikW1YmBH)`f<dm#Y4(2y{mVx%S5D?NS1udD
z{AM+%HjZLJU$Al%f@9#OKxh~@k78k8&_9e@hOuZAiwU$OgZgo^w<Ex@o?Z^q&<0dv
zDQ00A=3_b5U<Ep{lHR<Pj#$m-%~}|^4QH_)PeU{A#zvfHj4ogcuAtR%-H_`Z9KxMW
z>_+)KI!t#~B7=V;{F*`umxy#2Wt8(EbQ~ks9wZS(KV5#5Tn3Ia90r{}fI%pfbqBAG
zhZ)E7)ZzqA672%@izC5sBpo>dCcpXi$VNFztSQnmI&u`@zQ#bqFd9d&ls?RomgbSh
z9a2rjfNiKl2bR!$Y1B*?3Ko@s^L5lQN|i6ZtiZL|w5oq%{Fb@@E*2%%j=bcma{K~9
z*g1%nEZ;0g;S84ZZ$+Rfurh;Nhq0;{t~(EIRt}D@(Jb7fbe+_@H=t&)I)gPCtj*xI
z9S>k?WEAWBmJZ|gs}#{3*pR`-`!HJ)1Dkx8vAM6Tv1bHZhH=MLI;iC#Y!$c|$*R>h
zjP{ETat(izXB{@tTOAC4nWNhh1_%7AVaf!kVI5D=Jf5I1!?}stbx_Yv23hLf$iUTb
z-)WrTtd2X+;vBW_q*Z6}B!10fs=2FA=3gy*dljsE43!G*3Uw(Is>(-a*5E!T4}b-Y
zfvOC)-HYjN<T>fcpi`<nf-dRCvb<3DQ>=kG%(X3XcP?;p&=pz+F^6LKqRom~pA}O*
zitR+Np{QZ(D2~p_Jh<vCoM0+TuBZPGvkW<o2?W>-k|dL!LPmexLM?tEqI^qRDq9Mg
z5XBftj3z}dFir4oScbB&{m5>s{v&U=&_trq#7i&yQN}Z~OIu0}G)>RU*`4<}@7bB%
zKYxGx0#L#u199YKSWZwV$nZd>D>{mDTs4qDNyi$4QT6z~D_%Bgf?>3L#NTtvX;?2D
zS3IT*2i$Snp4fjDzR#<)A``4|dA(}wv^=L?rB!;kiotwU_gma`w+@AUtkSyhwp{M}
z!e`jbUR3AG4X<hiCae!0Z#IQzg_MO}8r9LZ8v9gatnAdq>vnBVcyIZht6Vi~?pC<x
z$UMBL*Un7qe%rPwVc5u??{Jvv@h48*X+33_?}H3zszQHeTZax+9HxTd_!Z$f2aech
zh-P!|7*abeZXa*+X4sU$RVNFp#Ueu?du6y}MLrh0fRY4k3<2mr8fTz23ECVQbp8Y-
z&)QObbuwkr*lDyqTgbBA1GXX|CT`-EiBViLVIpP1K+?n%?&?@)Sh}Jk6BD>C!$XF2
z*V~)DBVm8H7$*OZQJYl3482hadhsI2NCz~_NINtpC?|KI6H3`SG@1d%PsDdw{u}hq
zN;OU~F7L1jT&KAitilb&Fl3X12zfSuFm;X)xQWOHL&7d)Q5wgn{78QJ6k5J;is+XP
zCPO8_rlGMJB-kuQ*_=Yo1TswG4xnZd&eTjc8=-$6J^8TAa~kEnRQ@Zp-_W&B(4r@F
zA==}0vBzsF1mB~743XqBmL9=0RSkGn$cvHf*hyc{<2{@hW+jKjbC|y%CNupHY_NC%
zivz^btBLP-cDyV8j>u)=loBs>HoI5ME)xg)oK-Q0wAy|8WD$fm>K{-`0|W{H00;;G
z000j`0OWQ8aHA9e04^;603eeQIvtaXMG=2tcr1y8Fl-J;AS+=<0%DU8Bp3oEEDhA^
zOY)M8%o5+cF$rC?trfMcty*f)R;^v=f~}||Xe!#;T3eTDZELN&-50xk+J1heP5<Y<
znaL!12>AQ>h5O#S_uO;O@;~REd*_G$x$hVeE#bchX)otXQy|S5(oB)2a2%Sc(iDHm
z=d>V|a!BLp9^#)o7^EQ2kg=K4%nI^sK2w@-kmvB+ARXYdq?xC2age6)e4$^UaY=wn
zgLD^{X<Qzp>0A+{ySY+&7Rp<dye-mragf3s3i1+O8l*a2CZEftSs~5J@pO#O4)7|C
zt7Uj~klxE{r1P8rua)PyL4F6<1h{`zM(RZRbwXGlq#|A);Pd3ULF0xXt>ldwpC6=E
zSPq?y(rl8ZN%(A*sapd4PU+dIakIwT0=zxIJEUW0kZSo|(zFEWdETY*ZjIk9uNMUA
ze11=mHu8lUUlgRx!hItf0dAF#HfdIB+#aOuY--#Q<WBCACK9Bb(sOZ;c5{Cyz<cBw
zm1bp-V;m1~BFNo*$vCz+DJt0kPRa995vWJw-XL{}RlB%vJiX3)rFpN$?+a3lo1}Ta
z5Pm@8%QU_`NS4rE!XK0g9};Ch9HckI4PDZ_!B=Sf5sj~8(i`GQ+lWT%y3Dpc>N9Ry
zbx|XkG?PrBb@l6Owl{9Oa9w{x^R}%GwcEEfY;L-6OU<?oOa+Y>8<!eYQ6t`2)ofdl
zc;{-S33UnK7q@p9(UckBeN6snqO;Sqm}WF4tj?-V%V>|9RXvu`-ECS`jcO1x1MP{P
zcr;<OGtG7*Y*?2bmsPqAyQ>Bw##*Dod9K@pEx9z9G~MiNi>8v1OU-}vk*HbI)@CM?
zn~b=jWUF%HP=CS+VCP>GiAU_UOz$aq3%%Z2laq^Gx`WAEmuNScCN)OlW>YHGYFgV2
z42lO5ZANs5VMXLS-RZTvBJkWy*OeV#L;7HwWg51*E|RpFR=H}h(|N+79g)tIW!RBK
ze08bg^hlygY$C2`%N>7bDm`UZ(5M~DTanh3d~dg+OcNdUanr8azO?})g}EfnUB;5-
zE1FX=ru?X=zAk4_<Ezl!IJ%o@*-5QDZ_F&LtjWsjB34$YVV!lg_^wE|e8ZN&iP<gF
zk{VwPw_va>6@__o1fE+ml1r&u^f1Kb24Jf-)zKla%-dbd<mrDhd(j_(Z#&e2c`*dZ
zEQdkTY)e@YyRT{!&<SX+i*%Yv8@xOn0)xWrstxh(l#P{4BPP+-+6V6&w!t(G>>UZ1
zrj3!RR!Jg`ZnllKJ)4Yfg)@z>(fFepeOcp=F-^VHv?3jSxfa}-NB~*qkJ5Uq(yn+(
z<8)qbZh{C!xnO@-XC~XMNVnr-Z+paowv!$H7>`ypMwA(X4(knx7z{UcWWe-wXM!d?
zYT}xaVy|7T@yCbNOoy)$D=E%hUNTm(lPZqL)?$v+-~^-1P8m@Jm2t^L%4#!JK#Vtg
zyUjM+Y*!<JsDnwU8g|E1uIfHP3rHvJ9!aXvBUq$4(iwj@?39JY7oCLH7;6A1Nz<<H
z1@>$);1<)0MUqL00L0*EZcsE&usAK-?|{l|-)b7|PBKl}?TM6~#j9F+eZq<vwyg-f
zQ6xX`>25_L&oSl}D<NsQHWi6FoUn<~8Dj}##2gV0o3l~7I_rNmqaltZtyDLRo=Y;p
z0a9He7Bhe1h(8@f2`e3S8ea>OMv^-tacpDI)l*Ws3u+~jO@;t(T)P=HCEZ#s_5q=m
zOsVY!QsOJn)&+Ge6Tm)Ww_Bd@0PY(78ZJ)7_eP-cnXYk`>j9q`x2?Xc6O@55wF+6R
zUPdIX!2{VGA;FSivN@+;GNZ7H2(pTDnAOKqF*ARg+C54vZ@Ve`i?%nDDvQRh?m&`1
zq46gH)wV=;UrwfCT3F(m!Q5qYpa!#f6qr0wF=5b9rk%HF(ITc!*R3wIFaCcftGwPt
z(kzx{$*>g5L<;u}HzS4XD%m<I!)UoMT66l0a_guJuN5cfb<%8;;k8nDRh|y7UBi>l
zmdStbJcY@pn`!fUmkzJ8N>*8Y+DOO^r}1f4ix-`?x|khoRvF%jiA)8)P{?$8j2_qN
zcl3Lm9-s$xdYN9)>3j6BPFK)Jbovl|Sf_p((CHe!4hx@F)hd&&*Xb&{TBj>%pT;-n
z{3+hA^QZYnjXxtF2XwxPZ`S#<d^2juw?KdUVqx|<op0e=p+c^Pi1+3VHI*oQbiR#0
zkD$*T%?V;~fUbNye?jLj@|Se}GGC|jLH-JIk9!%S@mF>J8h>5qLwtwM-{5abbEnRS
z`9_`Zq8FJiI#0<P&Mg(f3yPBq!tDt&8IC9HFe+Bth{VH2yboj+w%3HDvxVXM^j?1(
zwiDqFWb&}ti)}gD7hasD>syE_V_3M&trw$P=ezkHosV$8&I5c0(*-9KBE5DJOC-Xv
zw<m$lNBLfj@6&mZzs0oi<Qj|X3`>}1bq~AD0_Xerm`<Ok+jV|`AJqBVFe!KKkg_Mz
zrgD2Y(cv~V++o1E?Q@Fb#qkz^+m(MNX7q)-j7!aMt7*o=wh`-=A|TuovAY%)$JOb;
ziiPbi!$xC<7r55`3&P!20u$}NF!bn?wH%06rXjj8Jr0A0r2+~^l2F?c>%ryiG9_$S
z5G|btfiAUNdV09SO2l9v+e#(H6HYO<P!tR27Pw*5XVu~2WN|!`P{UGP%8-B4o%Ll~
zx=yTCUICkMjVkuW4CwqFz7h4!Fut~?;&vovX6q0Mx`$8|3}@dO%QE^T1?&7>dQs=^
z@xwZQU)~;p1L*~ciC}9ao{nQ-@B>r<C#s-EpgVIa@U?Zt5-52*E0-_V`G<%#aCubc
z#~9)JgaCf3du7KIa@o9{F`a*Z#7_#Nr=<Du2&J->pUzK<MZ989iL#$$$VOIhI{#G2
zX1{e2r}58peujUp^RtpWi^k@dv<b@U5~*mriX4==h`~&q8}1%1bi*A9t2!+C=NB43
zr}OjT7%h=p7)QmY@e4Y?$S-O9vd*vYt2+OZe}&;5r#{sA*Zdouf6ITrLrLmd5$W`2
z{=LqB5J&!z|CF)tn6gdh*Ch4*S=>Bxv=cUusOP5Trs3QnvHxGh9e>s7AM{V1|HfYe
z3QwH;nHHR49fYzuGc3W3l5xrDAI392SFXx>lWE3V9Ds9il3PyZaN5>oC3>9W-^7vC
z3~KZ-@iD?tIkhg+6t{m;RGk2%>@I0&kf)o$+-^ls0(YABNbM(=l#ad@nKp_j=b~Xs
ziR;xu_+)lxy6|+af!@}gO2H_x)p;nZ-tYxW5Omq=l`GzMp*GTLr>vZN1?e}^C$t*Z
zvzEdIc2|HA2RFN_4#EkzMqKnb<pLBO4+WJ5@iu6<*yZ}5^dx`RJ6@oyUGTNLwp4D6
zQr+!_EwvXq9LV|FqKPDW{O#$8@RpRybyEJwEUB(P$J>bw!?!?%B@M0^^5Z<!X?H1X
z%bH?4ISS7xsT)h5y*R2kv373c0XvbALyIKqW8F4Rt^N+RBdC+p7-qZ2TG&<mY|Xw{
zYW8zn#X9x#oi~3O*$eA>;K?x-%lg?Z>}wMV8zEqHZ$cr~Y#Wv>9+)KMUZatUqbRU8
z8t9qrek(H^C0Tuzq|cP2$WL7tzj+Dj5y^2SF1D154CnsB$xbz`$wV||n-cG%rsT$p
z+3RHdadK(3-noj(2L#8c5lODg)V8pv(GEnNb@F>dEHQr>!qge@L>#qg)RAUtiOYqF
ziiV_ETExwD)bQ<))?-9$)E(FiRBYyC@}issHS!j9n)~I1tarxnQ2LfjdIJ)*jp{0E
z&1oTd%!Qbw$W58s!<?E8yP8T26Viz&^F4A~aC%qEomHk#Qm5Ec3e?P1Tj+$>6ms>F
z=p0!~_Mv~8jyaicOS*t(ntw`5uFi0Bc4*mH<SuY~bM{B5oPpIUn>8kSkk$>!f0;FM
zX<XOP5P@dz=8h9!x<TDSCLIj9Udx3_a=kV3LTpl(k=&H9%=)MqgIf>_<Kt$po&Fr{
zpKJorU@qqh(I4C6Tylqoku~P>t14I55!ZVsg0O$D2iuEDb7(J>5|NKW^Z~kzm@dax
z9(|As<jw)_1#$tQo>$U7^}LF%#`6r&UPB*6`!Rf74h~*C=ami6xUxYCwiJxdr$+`z
zKSC4A%8!s%R&j*<WtB&0;$gMI$I(tFKiavN8Kx<87G#)5v#A(w^XXcQlsP=<6ZA<U
z^(KEZv3e7!^3<Ei<w5UtbUk`RnxhmX4bQdZ{WNJ4n#oON_s~SV<X3w`-hL{m_Q~Un
zYCrlXg#3dvrKK$75BVy}D+j2spQb)YMR$&pvlKd(fpZ09t)v;W5Rxxaa&B-|%gVWy
zZlF&=A|I`y{q$*Y3DPpU5%%?9ZW(=sZiatmGoa^Z>2si(OEc*fy!q)?%=TjDZJ2}O
zxT6o>jlKXz_7_Y$N})}IG`*#KfMzs#R(SI#)3*ZEzCv%_tu(VT<m;!IE4+o?TZaBx
z5%PHoq2#QCL%*u*r`ZQdulCDJ$p1h^Kb=|a9i(u}0L`iPc~<xf{UPtM+i6ig4TXQa
zh5n@<I7)M?wUE|NXL)a<@gd*jMg25yXUHdA#XGO?^TDAfWV!iwLdZ#UHk}Ir&!rmm
z^eD6KphC1AP^%LZ5kTi+xOfkpNl{urF&HwAc^0jqBxYGukLLzTQ4{shPU@vr>Z5J|
zw2$5kK)xTa>xGFgS0?X(NecjzFVKG%VVn?neu=&eQ+DJ1APlY1E?Q1s!Kk=yf7Uho
z>8mg_!U{cKqpvI3ucSkC2V`!d^XMDk;>GG~>6>&X_z75-kv0UjevS5ORHV^e8r{tr
z-9z*y&0eq3k-&c_AKw~<`8dtjsP0XgFv6AnG?0eo5P14T{xW#b*Hn2gEnt5-KvN1z
zy!TUSi>IRbD3u+h@;fn7fy{F&hAKx7dG4i!c?5_GnvYV|_d&F16p;)pzEjB{zL-zr
z(0&AZUkQ!(A>ghC5U-)t7(EXb-3)tNgb=z`>8m8n+N?vtl-1i&*ftMbE~0zsKG^I$
zSbh+rUiucsb!Ax@yB}j>yGeiKIZk1Xj!i#K^I*LZW_bWQIA-}FmJ~<TRX$8LWfcRo
zq}p34A-eP?S`4%<+gY$&Qwo+hw|LR9qPfLa+1vuuio(^tL0Z`o@(s}04;;?o&(V25
zmb;P0Bj~2U&>^}>p=K$bX9F{}z{s^KWc~OK(zl_X57aB^J9v}yQ<s0WLmfS&Qlz{|
zxaO(1@2apqtdc1I3k-8L{2o1=b$p(R;f;f|3Q<=rX=(KVT7$=$CTP91Qk;2gg%ga0
zzT0Vz1mY4W2+uh{dPPXPm)7Qy6MQdLjCStV!T%5peg_o&22BHi7X!kpAX+WnHvohg
z=Pssv6$Tn8m(lm>5h#BE$+C)WOglV)nd0WWtaF{7`_Ur`my>4*NleQG#xae4fIo(b
zW(&|g*#YHZNvDtE|6}yHvu(hDekJ-t*f!2RK;FZHRMb*l@Qwkh*~CqQRNLaepXypX
z1?%ATf_nHIu3z6gK<7Dmd;{`0a!|toT0ck|TL$U;7Wr-*piO@R)KrbUz8SXO0vr1K
z>76arfrqImq!ny+VkH!4?x*IR$d6*;ZA}Mhro(mzUa?agrFZpHi*)P~4~4N;XoIvH
z9N%4VK|j4mV2DRQUD!_-9fmfA2(YVYyL#S$B;vqu7fnTbAFMqH``wS7^B5=|1O&fL
z)qq(oV6_u4x(I(**#mD}MnAy(C&B4a1n6V%$&=vrIDq^F_KhE5Uw8_@{V`_#M0vCu
zaNUXB=n0HT@D+ppDXi8-vp{tj)?7+k>1j}VvEKRgQ~DWva}8*pp`W8~KRo*kJ*&X}
zP!<CZsjx;t3k>~2fxQr@dM*q0dI|)Fux=pZWBk==RI7i{^BQf`kWlD2%|@R9!JA7&
zLbM$uJ12y}_62$|T|{)@OJZtzfpL^t@1nMTYHutrF#D+^?~CN~9`YQ@#&&@c_Zf)(
zbC~y8!2LO8jHwQXv>G~1q?c68ipT*%dY&c{<jL<V=~a)y5R&g!ma8yZh)3rp&)QiP
z*be8EDL{W#%vu6O4v<&2)|<%ZIdp{wA@~wVmko<FSH<^Bu>8wd_!Y#~tMJ7yk!F8|
zt?m_CLVw6cU@@p(#h4cY&Qsfz2Xp3w^4Cg%m03Tmq~9n%hyoMH^KY7{(QkRyn_!YB
zzZa!Tgr~5$MAG$x)Fs71#6j}Kvcv3=9VUX8C<A|XF(+o?2dGGttB{Wb)a$2igu>H<
zbP3|fY8f#$K*<5JQ7whM(v=GN2k26Xsh)#0!HKS(koLgAp-;)8z0w&_Z=nG4v6n8u
z&Tm0Fi){4_!Y5Kp?!zv$FKfUifQ{%c82uYfrvE{%ejUd72aNYmI*0z3-a-EYr+<Uj
z5G8+DxD62w6ZAeLoXgllSFo4%;dw2d*Rf9-dn@cRkKP5-{}C3u0K3(n=rwqJGHQ%J
zV=YO1*Jq7=J^eMk(_If41oYS8%b^P*ApZ`jyvh{@Y5%6l8oiD<J5E&^#fFepwH%zw
z2)Z?TgHS9Sd6UNF4Z-WaEQtzH85)A;e4~G6Vu{Q?vK?al1150x5!q@5uEqJ-asy4}
zsOV<4tnl7U6DulJz1Mee=rsUyHnLOC@Ls4&SPqb%$5TG*G?OQxTA57qI6r64FV0$`
z81}wHS)v$K&TDGVcWNvTAX`NLr|Pc5D#r4TOKo(|aVq3tp(h96t>bB->oH3#t(AY3
zV{Z=(SJr;D#0(`u*dc*~9T7D8Pudw894%!>c4wU&V1m<~0InidR6fbi?yPl(z+sKa
zdF*kS>_4^1UO>y4T%Ar>epSr5&vp`$KdY7B(F%P0@VyHk@1fJ=6X0=aGjD-)BrOJD
zW}IU@hg~^2r>a1fQvjTtvL*mKJ7q;pfP*U2=URL`VB_Y_JojbZ+MS=vaVN0C6L_MV
zG1#5=35-E`KsD%r>-Q_ndvJ2tOYcMMP9f*t0iJ`(Z`^+YP)h>@lR(@Wvrt-`0tHG+
zuP2R@@mx=T@fPoQ1s`e^1I0H*kQPBGDky@!ZQG@8jY-+2ihreG5q$6i{3vmDTg0j$
zzRb*-nKN@{_wD`V6+i*YS)?$XfrA-sW?js?SYU8#vXxxQCc|*K!EbpW<KRGsVy9Os
zNyU)fm61&L7?yMWP5o&7oWUu^HNh}amXSDW-&BNuI^&g)GJZL(^6;E1sc|pqBv-P<
zFlK5cTBl^Coya(1@D8I$sA9-lEkP~Y<yh5&y5hA^1b2!zn?eOAJh|GZ`V9?JYd?n2
z4SroDUsL9s(cJp?TeH+hub>fu)3~jwq6_@KC0m;3A%jH^18_a0;ksC2DEwa@2{9@{
z9@T??<4QwR69zk{UvcHHX;`ICOwrF;@U;etd@YE)4MzI1WCsadP=`%^B>xPS-{`=~
zZ+2im8meb#4p~XIL9}ZOBg7D8R=PC8V}ObDcxEEK(4yGKcyCQWUe{9jCs+@k!_y|I
z%s{W(&>P4w@hjQ>PQL$zY+=&aDU6cWr#hG)BVCyfP)h>@3IG5I2mk;8K>)Ppba*!h
z005B=001VF5fT=Y4_ytCUk`sv8hJckqSy&Gc2Jx^WJ$J~08N{il-M$fz_ML$)Cpil
z(nOv_nlZB^c4<p#(?a)_u4(B)SGtQ9q!hQL%eVebEx+D7GnQ;27x<v}?t8lL+;f+A
z=l%QbH{Swq3jdODKh`@i3QfXQT$4yD@lfVL7h&-B1}~lwVM>s&&O3h=OLiCz&(|f0
zxWU_-JZy>hxP*gvR>CLnNeQ1~g;6{g#-}AbkIzWR;j=8=6!AHpKQCbjFYxf9h%bov
zVi;eNa1>t-<14KERUW>^KwoF+8zNo`<C`pgD~xZ4@f``@#rK%RtuVeH#t-=LEfFsZ
zI51=6l~P)>Y*WiQwq}3m0_2RYtL9Wmu`JaRaQMQ)`Si^6+VbM`!rH~T?DX2=(n4nT
zf`G`(Rpq*pDk*v~wMYPZ@vMNZDMPnxMYmU!lA{Xfo?n=Ibb4y3eyY1@Dut4|Y^ml&
zqs$r}jAo=B(Ml>ogeEjyv(E`=kBzPf2uv9TQtO$~bamD#=Tv`lNy(K|w$J2O6jS51
zzZtOCHDWz7W0=L1XDW5WR5mtLGc~W+>*vX<GHIG*=s;|*X|~o=RPDX-Sc|p7dfc1I
z+bdepF%{N5JNm9xkG~_}9JBmx6ag(^S{f7(&MB5Ut8gI01%ma&PSY^R4bxkR{0FUk
z>5{e~U@rE~?7e>vKU-v8bj;F4#abtcV(3ZtwXo9ia93HiETyQXwW4a-0){;$OU*l`
zW^bjkyZ<KrU~bFi>TJ6_DL^0}`*)#EZ|2nvKRzMLH9-~@Z6$v#t8Dm%(qpP+<GMP%
zX{);BhCQIW(Gn;+LWW}KSArMA5#JMCwNuLrnSDaQ;az_=OZB4O(I)T>DgzNe6d)1q
zBqhyF$jJTyYFvl_=a>#I8jhJ)d6SBNPg#xg2^kZ3NX8kQ74ah(Y5Z8mlXyzTD&}Q8
ziY(pj-N-V2f>&hZQJ`Di%wp2fN(I%F@l)3M8GcSdNy+#HuO{$I8NXubRlFkL)cY@b
z#`v{}-^hRXEq*8B_cG=%PZvI$eo(|8Wc(2o8L#0_GX9L$1@yV>%7mGk)QTD1R*OvS
z4OW;ym1)%k9Bfem0tOqq3yyAUWp&q|LsN!RDnxa|j;>R|Mm2rIv7=tej5GFaa+`#|
z;7u9Z_^XV+vD@2hF8Xe63+Qd`oig6S9jX(*DbjzPb*K-H7c^7E-(~!R6E%T<QrU8a
zoQYBuMl~zy=+|`P2J!7}I5U^Ks^;xITZ?|FpLmb=m=4EAn+x?|Qv;lIYp*ZXvf!JQ
z*?%I>rgW;RvG;WS{Ziv*W*a*`9Bb;$Er3?MyF~5G<LECu4)?S?zq`}l-6Be9igL+N
zh`N7hDOc2GQxkBc_04ZYOy0dF-2c<LysnaQzmR#Nd~*K)?c4go+&{eT7l@5={|h-A
z1;r+~VC?cFyA~?=)<Ut2x6>cXv`k>U)n}lwv$Sp+H@IKA5$mKk0g*4Ln{!tfvITeY
zzr%8JJ5BdcEYsR9e<J*1QJ-;?lGTLgRri0{(Mx*^e9N-cvKPd8)1ZvmTl)}Mp*PMb
zJ>GzJ4B&$}4FMmbRU6{8{_w7Kl77@PNe<H<wNM(*(dvGh1)78L8idze)sN69(F_bD
zfFpRAB-vBKc}&vG08>7|Bc#c?5(C5&Z=kJ#(oM90D4`rh2S!|^L!P#e#1hkD5@~--
z`<QQ&C6VTv@kABvH3YKpWDUXD_*kNb(3!wC#8v()Ttmk;q}3WaX(d<D73rp7AV5PE
zJvH>63GV0~*rOZSqw7k^#-Y$Q4z3Oa2SPRURqEahB1B^h{7~+p03SwzqL9QU#$3-X
zdYtQ?-K5xDAdfomEd6(yP<r4XU0e%L6Gs?6mZyM_@USHu0!gS4d3Fj?NQ4o2RTLE!
zsZeABR7EXMsfc7!I><w4;nzxeSu{*)rP3*7pbb=qhn4}Y2n9kR0m4&2#L{A=NS7O+
zq<gb--~a#L?(KhfJM+)&{^xa2;9hFiS^M-I@96A#^P5^~n|$x<`ddB`%@&&L<Q!2c
z3T)0gzIbLnIPU9=rs~b%+*kaqOYa3~2NrY$**DZ_28oj!E0}c#hEXZW5#1F%_rp2Y
z@7+$!3(WI<_EWCV)`TqCTTmmZb^3u}aj?mmoaBAb!n-={l6S|)$2$1IvpT^qzBZEw
z8e=}4<>tZ!yY_<35bMedeq`z2JWorljz5-f9<^93HM-$#+acw%9r!JOM%O<|BR`W&
zd-%j_?b^q7Kl6{q^N{cg2u;11rFB5EP+oqG9&pHD#_Mo@aNMj;LUvsl&nK(ca(hT(
zzFc2oHC6WQv8g7jo+3ZSwK+9G$cvfRnql)?g=XeQ3+LTh3)79nhEle8OqS3T$qn(>
z(=5Bg?EWq-ldEywgzXW9<IVcZw0PFB^dyb+qfMQWtjsj)vresv4TXCoZ567G0y;gP
z?>65%H(9^ik*rH(8dNdkbcS9|ow&_r`X~R^R?B+(oT<WD#3|w3t>iMzzlx8KnHqUi
z<C-MSdTAJmKaI>8Rh-)VAnS-CO+3}yxqm8)X+N+uzieFVm-F#syP#M1p5&$wX3MJ8
z+R@grZ*5G^Uh4I@VT=>C4RJNc^~3mx$kS1F{L?3)BzdduD2MZKdu#jNno&f2&d{?`
zW(>$oktzY@GO{|Ln~Bt^A4)(%?<rC#>l-&(D<Yw`9>m!iL#$K_xOyhwAf=K2<+Bom
z<r)*8MZ!$_D%ll%W4Ye$$4y&cK*~WyOiCrNvVfg^98_+DMF;q@k4CQVgxx|A9Hkzk
zY%$3c2K(I6As4DS?_GUJlhQ!Vji$Rs6$y9lpo|T>w7|hl6E5}B$d%n0sfZv<a3(um
z6<;qRVVB1$nE}(k(@3SY^L5&aKgBpn4?AzyzXPQPQ}9ARNm5~`3PH@`&Rv!G*6&j!
z{V*$-!6Q(LiIj*sp{qn3B5ACQ7T%2B=uQTovb#r{!Sw+S`r-sQoh4y>fQRy9Fyz2~
z83#=#LaHnf1th^k*<o}w3D|OX)SLtn@-US^I4);^RK5=p7oq$X3H5?EAaoFSl}3p%
z6LeUX>p|ux8!!8pfHE!)x*%=_hAddl)P%4h4%&8!5-W#xqqb}c=H(i|wqcIS&oDQ{
zhI7N-$f$ra3=RjPmMh?-IEkJYQ<}R9Z!}wmp$#~Uc%u1oh#TP}wF*kJJmQX2#27kL
z_dz(yKufo<=m71bZfLp^Ll#t3(IHkrgMcvx@~om%Ib(h(<$Da7urTI`x|%`wD--sN
zJEEa>4DGSEG?0ulkosfj8IMNN4)B=ZtvGG{|4Fp=Xhg!wPNgYzS>{Bp%%Qa+624X@
X49Luk)baa85H9$5YCsTPT`SVRWMtMW

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf..69a9715 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0..744e882 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

From 7c2ad09ff1726d6fc5bfb09de0904b4e579e4241 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 18 Jun 2021 21:31:40 -0700
Subject: [PATCH 187/262] Removed checkstyle, using IDEA default code format.

---
 .idea/codeStyles/Project.xml                  |  10 +-
 .idea/inspectionProfiles/Project_Default.xml  |  36 +++
 .idea/jarRepositories.xml                     |   5 +
 .idea/misc.xml                                |   3 +
 build.gradle                                  |  19 +-
 config/checkstyle/checkstyle.xml              | 277 ------------------
 .../net/thauvin/erik/mobibot/modules/War.java |   4 +-
 .../thauvin/erik/mobibot/modules/Twitter.kt   |   2 +-
 version.properties                            |   6 +-
 9 files changed, 56 insertions(+), 306 deletions(-)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 config/checkstyle/checkstyle.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index e310056..3ad4dc5 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -9,15 +9,7 @@
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="kotlin">
-      <option name="CALL_PARAMETERS_WRAP" value="5" />
-      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-      <option name="METHOD_PARAMETERS_WRAP" value="5" />
-      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-      <option name="EXTENDS_LIST_WRAP" value="1" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..f243f08
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,36 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="created,created,created" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 39b5ad2..8920634 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$MAVEN_REPOSITORY$/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0474152..1503b42 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <pattern value="net.thauvin.erik.mobibot.modules.War" method="War" />
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="15" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 7f5e9cb..412ab78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'application'
-    id 'checkstyle'
     id 'com.github.ben-manes.versions' version '0.39.0'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.17.1'
@@ -153,27 +152,19 @@ jacoco {
 }
 
 jacocoTestReport {
-    dependsOn(test)
+    dependsOn test
     reports {
-        html.enabled = true
-        xml.enabled = true
-    }
-}
-
-tasks.withType(Checkstyle) {
-    reports {
-        xml.enabled = false
-        html.enabled = true
+        html.required = true
+        xml.required = true
     }
 }
 
 tasks.sonarqube {
-    dependsOn('jacocoTestReport')
+    dependsOn 'jacocoTestReport'
 }
 
 task copyToDeploy(type: Copy) {
-    from('properties')
-    from jar
+    from('properties', jar)
     into deployDir
 }
 
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
deleted file mode 100644
index c5f6465..0000000
--- a/config/checkstyle/checkstyle.xml
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
-
-<!--
-    Checkstyle configuration that checks the Google coding conventions from Google Java Style
-    that can be found at https://google.github.io/styleguide/javaguide.html.
-
-    Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
-
-    To completely disable a check, just comment it out or delete it from the file.
-
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
- -->
-
-<module name="Checker">
-    <property name="charset" value="UTF-8"/>
-
-    <property name="severity" value="warning"/>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <!-- Excludes all 'module-info.java' files              -->
-    <!-- See https://checkstyle.org/config_filefilters.html -->
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="module\-info\.java$"/>
-    </module>
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
-    </module>
-
-    <module name="LineLength">
-        <property name="max" value="120"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-    </module>
-
-    <module name="SuppressWarningsFilter"/>
-
-    <module name="SuppressWithPlainTextCommentFilter">
-        <property name="offCommentFormat" value="CHECKSTYLE_OFF"/>
-        <property name="onCommentFormat" value="CHECKSTYLE_ON"/>
-        <property name="checkFormat"
-                  value="^((?!(FileTabCharacterCheck)).)*$"/>
-    </module>
-
-    <module name="TreeWalker">
-        <module name="SuppressWarningsHolder"/>
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="CHECKSTYLE_OFF: ALMOST_ALL"/>
-            <property name="onCommentFormat" value="CHECKSTYLE_ON: ALMOST_ALL"/>
-            <property name="checkFormat" value="^((?!(EqualsHashCode)).)*$"/>
-        </module>
-        <module name="OuterTypeFilename"/>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format"
-                      value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message"
-                      value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
-        </module>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="AvoidStarImport"/>
-        <module name="OneTopLevelClass"/>
-        <module name="NoLineWrap"/>
-        <module name="EmptyBlock">
-            <property name="option" value="TEXT"/>
-            <property name="tokens"
-                      value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-        </module>
-        <module name="NeedBraces"/>
-        <module name="LeftCurly"/>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlySame"/>
-            <property name="tokens"
-                      value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE,
-                    LITERAL_DO"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlyAlone"/>
-            <property name="option" value="alone"/>
-            <property name="tokens"
-                      value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT,
-                    INSTANCE_INIT"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyLambdas" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <message key="ws.notFollowed"
-                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-            <message key="ws.notPreceded"
-                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="OneStatementPerLine"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="ArrayTypeStyle"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="FallThrough"/>
-        <module name="UpperEll"/>
-        <module name="ModifierOrder"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapDot"/>
-            <property name="tokens" value="DOT"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapComma"/>
-            <property name="tokens" value="COMMA"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/258 -->
-            <property name="id" value="SeparatorWrapEllipsis"/>
-            <property name="tokens" value="ELLIPSIS"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/259 -->
-            <property name="id" value="SeparatorWrapArrayDeclarator"/>
-            <property name="tokens" value="ARRAY_DECLARATOR"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="id" value="SeparatorWrapMethodRef"/>
-            <property name="tokens" value="METHOD_REF"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-            <message key="name.invalidPattern"
-                     value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="TypeName">
-            <message key="name.invalidPattern"
-                     value="Type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-                     value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LambdaParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="CatchParameterName">
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Catch parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalVariableName">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
-            <message key="name.invalidPattern"
-                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="InterfaceTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-                     value="Interface type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="NoFinalizer"/>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-            <message key="ws.preceded"
-                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-            <message key="ws.illegalFollow"
-                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-            <message key="ws.notPreceded"
-                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="4"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="4"/>
-        </module>
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="1"/>
-        </module>
-        <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="VariableDeclarationUsageDistance"/>
-        <module name="CustomImportOrder">
-            <property name="customImportOrderRules"
-                      value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
-            <property name="specialImportsRegExp" value="^javax\."/>
-            <property name="standardPackageRegExp" value="^java\."/>
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="false"/>
-        </module>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceBefore">
-            <property name="tokens"
-                      value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
-            <property name="allowLineBreaks" value="true"/>
-        </module>
-        <module name="ParenPad"/>
-        <module name="OperatorWrap">
-            <property name="option" value="NL"/>
-            <property name="tokens"
-                      value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
-                    LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF "/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationMostCases"/>
-            <property name="tokens"
-                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="id" value="AnnotationLocationVariables"/>
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="JavadocTagContinuationIndentation"/>
-        <module name="SummaryJavadoc">
-            <property name="forbiddenSummaryFragments"
-                      value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-        </module>
-        <module name="JavadocParagraph"/>
-        <module name="AtclauseOrder">
-            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-            <property name="target"
-                      value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
-        </module>
-        <module name="MethodName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
-            <message key="name.invalidPattern"
-                     value="Method name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="SingleLineJavadoc">
-            <property name="ignoreInlineTags" value="false"/>
-        </module>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="expected"/>
-        </module>
-        <!-- <module name="CommentsIndentation"/> -->
-    </module>
-</module>
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 88e70f7..1f86130 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -52,8 +52,8 @@ public final class War extends AbstractModule {
     // War command
     private static final String WAR_CMD = "war";
     // Deck of card
-    private static final String[] WAR_DECK = 
-        {"Ace", "King", "Queen", "Jack", "10", "9", "8", "7", "6", "5", "4", "3", "2"};
+    private static final String[] WAR_DECK =
+            {"Ace", "King", "Queen", "Jack", "10", "9", "8", "7", "6", "5", "4", "3", "2"};
     // Suits for the deck of card
     private static final String[] WAR_SUITS = {"Hearts", "Spades", "Diamonds", "Clubs"};
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
index 09441a4..f018be9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -130,7 +130,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
                         }
                         post(message = msg, isDm = false)
                     } catch (e: ModuleException) {
-                        if (bot.logger.isWarnEnabled) logger.warn("Failed to post entry on Twitter.", e)
+                        if (logger.isWarnEnabled) logger.warn("Failed to post entry on Twitter.", e)
                     }
                 }.start()
                 removeEntry(index)
diff --git a/version.properties b/version.properties
index f04ec96..d03d290 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon May 31 14:55:18 PDT 2021
-version.buildmeta=870
+#Fri Jun 18 20:20:40 PDT 2021
+version.buildmeta=872
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+870
+version.semver=0.8.0-beta+872

From a8a45001255c902b08eede5504655371a6139a54 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 6 Jul 2021 17:08:41 -0700
Subject: [PATCH 188/262] Updated dependencies.

---
 .circleci/config.yml                          |  9 ++-
 .editorconfig                                 |  2 +-
 .github/workflows/gradle.yml                  |  2 +-
 .gitignore                                    | 73 ++++++++++---------
 build.gradle                                  | 16 ++--
 deploy.sh                                     | 13 ++--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 properties/log4j2.xml                         | 28 +++----
 .../net/thauvin/erik/mobibot/FeedReader.kt    |  4 +-
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  | 10 +--
 .../net/thauvin/erik/mobibot/UtilsTest.kt     |  8 +-
 .../thauvin/erik/mobibot/modules/JokeTest.kt  |  2 +-
 version.properties                            |  6 +-
 13 files changed, 90 insertions(+), 85 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 19da0e1..cd06643 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,8 @@ defaults_gradle: &defaults_gradle
         name: Gradle Dependencies
         command: ./gradlew dependencies
     - save_cache:
-        paths: ~/.m2
+        paths:
+          - ~/.m2
         key: gradle-dependencies-{{ checksum "build.gradle" }}
     - run:
         name: Run All Checks
@@ -49,7 +50,7 @@ jobs:
 workflows:
   version: 2
   gradle:
-        jobs:
-        - build_gradle_jdk11
-        - build_gradle_jdk15
+    jobs:
+      - build_gradle_jdk11
+      - build_gradle_jdk15
 
diff --git a/.editorconfig b/.editorconfig
index a6971e1..1f808de 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,2 +1,2 @@
 [*]
-insert_final_newline=true
+insert_final_newline = true
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 715e6fe..1bb63d7 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -1,6 +1,6 @@
 name: gradle-ci
 
-on: [push, pull_request, workflow_dispatch]
+on: [ push, pull_request, workflow_dispatch ]
 
 jobs:
   build:
diff --git a/.gitignore b/.gitignore
index 4d04f45..2b959f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,9 @@
-__pycache__
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/settings.json
 !.vscode/tasks.json
 !gradle-wrapper.jar
 !properties/*
-.classpath
-.DS_Store
-.gradle
-.history
-.idea_modules/
-.idea/**/contentModel.xml
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/dataSources/
-.idea/**/dbnavigator.xml
-.idea/**/dictionaries
-.idea/**/dynamic.xml
-.idea/**/gradle.xml
-.idea/**/libraries
-.idea/**/mongoSettings.xml
-.idea/**/shelf
-.idea/**/sqlDataSources.xml
-.idea/**/tasks.xml
-.idea/**/uiDesigner.xml
-.idea/**/usage.statistics.xml
-.idea/**/workspace.xml
-.idea/**/caches/build_file_checksums.ser
-.idea/**/httpRequests
-.idea/**/replstate.xml
-.idea/**/shelf/
-.kobalt
-.mtj.tmp/
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
-.nb-gradle
-.project
-.scannerwork
-.settings
-.vscode/*
 *.class
 *.code-workspace
 *.ctxt
@@ -52,6 +17,43 @@ __pycache__
 *.tar.gz
 *.war
 *.zip
+.DS_Store
+.classpath
+.gradle
+.history
+.idea/**/caches/build_file_checksums.ser
+.idea/**/contentModel.xml
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/dataSources/
+.idea/**/dbnavigator.xml
+.idea/**/dictionaries
+.idea/**/dynamic.xml
+.idea/**/gradle.xml
+.idea/**/httpRequests
+.idea/**/libraries
+.idea/**/mongoSettings.xml
+.idea/**/replstate.xml
+.idea/**/shelf
+.idea/**/shelf/
+.idea/**/sonarlint*
+.idea/**/sqlDataSources.xml
+.idea/**/tasks.xml
+.idea/**/uiDesigner.xml
+.idea/**/usage.statistics.xml
+.idea/**/workspace.xml
+.idea_modules/
+.kobalt
+.mtj.tmp/
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+.nb-gradle
+.project
+.scannerwork
+.settings
+.vscode/*
+Thumbs.db
+__pycache__
 atlassian-ide-plugin.xml
 bin/
 build/
@@ -85,5 +87,4 @@ project.properties
 release.properties
 target/
 test-output
-Thumbs.db
 venv
diff --git a/build.gradle b/build.gradle
index 412ab78..e87ec18 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ plugins {
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.10'
-    id 'org.jetbrains.kotlin.kapt' version '1.5.10'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.20'
+    id 'org.jetbrains.kotlin.kapt' version '1.5.20'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -21,8 +21,8 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
-    log4j   : '2.14.1',
-    pmd     : '6.35.0',
+        log4j: '2.14.1',
+        pmd  : '6.35.0',
 ]
 
 repositories {
@@ -48,19 +48,19 @@ dependencies {
     implementation 'commons-net:commons-net:3.8.0'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
 
-    implementation 'com.rometools:rome:1.15.0'
+    implementation 'com.rometools:rome:1.16.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'net.aksingh:owm-japis:2.5.3.0'
     implementation 'net.objecthunter:exp4j:0.4.8'
-    
+
     implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
     implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
-    
+
     implementation 'org.json:json:20210307'
     implementation 'org.jsoup:jsoup:1.13.1'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
-    testImplementation 'org.assertj:assertj-core:3.20.1'
+    testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'org.testng:testng:7.4.0'
 }
 
diff --git a/deploy.sh b/deploy.sh
index 9ac698d..11bbc7b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,12 +2,11 @@
 
 DEPLOYDIR=/home/erik/mobitopia/mobibot
 
-if [ -f "deploy/mobibot.jar" ]
-then
-    /bin/cp deploy/mobibot.jar $DEPLOYDIR
-    rm -rf $DEPLOYDIR/lib/*.jar
-    cp deploy/lib/*.jar $DEPLOYDIR/lib
-    chmod 755 $DEPLOYDIR/*.jar $DEPLOYDIR/lib/*.jar
+if [ -f "deploy/mobibot.jar" ]; then
+  /bin/cp deploy/mobibot.jar $DEPLOYDIR
+  rm -rf $DEPLOYDIR/lib/*.jar
+  cp deploy/lib/*.jar $DEPLOYDIR/lib
+  chmod 755 $DEPLOYDIR/*.jar $DEPLOYDIR/lib/*.jar
 else
-    echo "mobibot.jar not found."
+  echo "mobibot.jar not found."
 fi
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69a9715..05679dc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/properties/log4j2.xml b/properties/log4j2.xml
index 6c658d9..2842592 100644
--- a/properties/log4j2.xml
+++ b/properties/log4j2.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="WARN">
-  <Appenders>
-    <Console name="stderr" target="SYSTEM_ERR">
-      <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
-    </Console>
-  </Appenders>
-  <Loggers>
-    <Logger name="net.thauvin.erik.mobibot" level="warn" additivity="false">
-      <AppenderRef ref="stderr"/>
-    </Logger>
-    <Root level="error">
-      <AppenderRef ref="stderr"/>
-    </Root>
-  </Loggers>
-</Configuration>
\ No newline at end of file
+    <Appenders>
+        <Console name="stderr" target="SYSTEM_ERR">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="net.thauvin.erik.mobibot" level="warn" additivity="false">
+            <AppenderRef ref="stderr"/>
+        </Logger>
+        <Root level="error">
+            <AppenderRef ref="stderr"/>
+        </Root>
+    </Loggers>
+</Configuration>
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index 884ca78..5930ca2 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -62,8 +62,8 @@ class FeedReader(
                     send(sender, it)
                 }
             } catch (e: FeedException) {
-                if (logger.isDebugEnabled) logger.debug("Unabled to parse the feed at $url", e)
-                send(sender, "An error has occured while parsing the feed: ${e.message}", false)
+                if (logger.isDebugEnabled) logger.debug("Unable to parse the feed at $url", e)
+                send(sender, "An error has occurred while parsing the feed: ${e.message}", false)
             } catch (e: IOException) {
                 if (logger.isDebugEnabled) logger.debug("Unable to fetch the feed at $url", e)
                 send(sender, "An error has occurred while fetching the feed: ${e.message}", false)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index f55ff61..60895b3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -260,12 +260,10 @@ object Utils {
         days %= 30
         val weeks = days / 7
         days %= 7
-        val hours = TimeUnit.MILLISECONDS.toHours(uptime) - TimeUnit.DAYS.toHours(
-            TimeUnit.MILLISECONDS.toDays(uptime)
-        )
-        val minutes = TimeUnit.MILLISECONDS.toMinutes(uptime) - TimeUnit.HOURS.toMinutes(
-            TimeUnit.MILLISECONDS.toHours(uptime)
-        )
+        val hours = TimeUnit.MILLISECONDS.toHours(uptime) - TimeUnit.DAYS.toHours(TimeUnit.MILLISECONDS.toDays(uptime))
+        val minutes =
+            TimeUnit.MILLISECONDS.toMinutes(uptime) - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(uptime))
+
         with(info) {
             if (years > 0) {
                 append(years).append(" year ".plural(years, " years "))
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 2dd8dd5..953c2b6 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -77,7 +77,10 @@ class UtilsTest {
     @Test
     fun testBold() {
         assertThat(bold(1)).describedAs("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
-        assertThat(bold(ascii)).describedAs("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+        // @TODO causes problems with Kotlin 1.5.20
+        // assertThat(bold(ascii)).describedAs("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+        assertThat(bold("test")).describedAs("bold(test)").isEqualTo(Colors.BOLD + "test" + Colors.BOLD)
+
     }
 
     @Test
@@ -94,6 +97,9 @@ class UtilsTest {
         )
         assertThat(colorize(ascii, Colors.RED)).describedAs("colorize(red)")
             .isEqualTo(Colors.RED + ascii + Colors.NORMAL)
+        // @TODO casues problems with Kotlin 1.5.20
+        // assertThat(colorize(ascii, Colors.BOLD)).describedAs("colorized(bold)")
+            // .isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
         assertThat(colorize(null, Colors.RED)).describedAs("colorize(null)").isEqualTo(Colors.NORMAL)
     }
 
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
index 073d089..eabd984 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
@@ -41,7 +41,7 @@ import org.testng.annotations.Test
 class JokeTest {
     @Test
     @Throws(ModuleException::class)
-    fun testRamdomJoke() {
+    fun testRandomJoke() {
         assertThat(randomJoke().msg.isNotEmpty()).describedAs("randomJoke() > 0").isTrue
         assertThat(randomJoke().msg).describedAs("randomJoke()").containsIgnoringCase("chuck")
     }
diff --git a/version.properties b/version.properties
index d03d290..89f3d69 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Jun 18 20:20:40 PDT 2021
-version.buildmeta=872
+#Tue Jul 06 14:30:07 PDT 2021
+version.buildmeta=885
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+872
+version.semver=0.8.0-beta+885

From 663f7d682aba5f6bce576575fc2b2c87ac6745e7 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 6 Jul 2021 18:24:13 -0700
Subject: [PATCH 189/262] Reverted to Kotlin 1.5.10.

---
 build.gradle                                          | 4 ++--
 src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt | 8 +++-----
 version.properties                                    | 6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index e87ec18..b933dac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ plugins {
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.20'
-    id 'org.jetbrains.kotlin.kapt' version '1.5.20'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.10'
+    id 'org.jetbrains.kotlin.kapt' version '1.5.10'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 953c2b6..4978cbf 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -77,8 +77,7 @@ class UtilsTest {
     @Test
     fun testBold() {
         assertThat(bold(1)).describedAs("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
-        // @TODO causes problems with Kotlin 1.5.20
-        // assertThat(bold(ascii)).describedAs("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+        assertThat(bold(ascii)).describedAs("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
         assertThat(bold("test")).describedAs("bold(test)").isEqualTo(Colors.BOLD + "test" + Colors.BOLD)
 
     }
@@ -97,9 +96,8 @@ class UtilsTest {
         )
         assertThat(colorize(ascii, Colors.RED)).describedAs("colorize(red)")
             .isEqualTo(Colors.RED + ascii + Colors.NORMAL)
-        // @TODO casues problems with Kotlin 1.5.20
-        // assertThat(colorize(ascii, Colors.BOLD)).describedAs("colorized(bold)")
-            // .isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+        assertThat(colorize(ascii, Colors.BOLD)).describedAs("colorized(bold)")
+            .isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
         assertThat(colorize(null, Colors.RED)).describedAs("colorize(null)").isEqualTo(Colors.NORMAL)
     }
 
diff --git a/version.properties b/version.properties
index 89f3d69..d365de4 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Jul 06 14:30:07 PDT 2021
-version.buildmeta=885
+#Tue Jul 06 18:00:45 PDT 2021
+version.buildmeta=927
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+885
+version.semver=0.8.0-beta+927

From 5d90571843b194a901647b460616f72418ba37aa Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 8 Jul 2021 12:27:57 -0700
Subject: [PATCH 190/262] Switched back to Java 1.8 compatibility.

---
 build.gradle       | 8 ++++----
 version.properties | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index b933dac..9b77fb4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ plugins {
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.10'
-    id 'org.jetbrains.kotlin.kapt' version '1.5.10'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.20'
+    id 'org.jetbrains.kotlin.kapt' version '1.5.20'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -75,8 +75,8 @@ test {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 kapt {
diff --git a/version.properties b/version.properties
index d365de4..a78c1d5 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Jul 06 18:00:45 PDT 2021
-version.buildmeta=927
+#Thu Jul 08 12:26:26 PDT 2021
+version.buildmeta=930
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+927
+version.semver=0.8.0-beta+930

From d8930a95204dbf16040716632755ae1d58cec93a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 01:14:06 -0700
Subject: [PATCH 191/262] Dependencies update.

---
 .circleci/config.yml        |  5 ++---
 .idea/misc.xml              |  2 +-
 .idea/runConfigurations.xml | 10 ++++++++++
 build.gradle                | 15 +++++++--------
 settings.gradle             | 17 +++++++++++++++++
 5 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cd06643..a7df501 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,7 +35,7 @@ jobs:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:15.0.2
+      - image: cimg/openjdk:15.0
 
     <<: *defaults_gradle
 
@@ -43,7 +43,7 @@ jobs:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:11.0.10
+      - image: cimg/openjdk:11.0
 
     <<: *defaults_gradle
 
@@ -53,4 +53,3 @@ workflows:
     jobs:
       - build_gradle_jdk11
       - build_gradle_jdk15
-
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1503b42..d755e4c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,5 +4,5 @@
     <pattern value="net.thauvin.erik.mobibot.modules.War" method="War" />
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="15" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="16" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9b77fb4..ccdd746 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,12 @@ plugins {
     id 'application'
     id 'com.github.ben-manes.versions' version '0.39.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.17.1'
+    id 'io.gitlab.arturbosch.detekt' version '1.18.0-RC2'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.20'
-    id 'org.jetbrains.kotlin.kapt' version '1.5.20'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.21'
+    id 'org.jetbrains.kotlin.kapt' version '1.5.21'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -39,14 +39,13 @@ dependencies {
     compileOnly 'pircbot:pircbot:1.5.0:sources'
 
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
 
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
     implementation 'commons-cli:commons-cli:1.4'
     implementation 'commons-net:commons-net:3.8.0'
-    implementation 'org.apache.commons:commons-lang3:3.12.0'
 
     implementation 'com.rometools:rome:1.16.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
@@ -57,7 +56,7 @@ dependencies {
     implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
 
     implementation 'org.json:json:20210307'
-    implementation 'org.jsoup:jsoup:1.13.1'
+    implementation 'org.jsoup:jsoup:1.14.1'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
     testImplementation 'org.assertj:assertj-core:3.20.2'
@@ -75,8 +74,8 @@ test {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 kapt {
diff --git a/settings.gradle b/settings.gradle
index 48e3810..53bc4db 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,18 @@
+plugins {
+    id "com.gradle.enterprise" version "3.6.3"
+}
+
+gradleEnterprise {
+    buildScan {
+    link("GitHub", "https://github.com/ethauvin/pinboard-poster/tree/master")
+    if (System.getenv("CI")) {
+            uploadInBackground = false
+            publishOnFailure()
+            tag "CI"
+        }
+        termsOfServiceUrl = "https://gradle.com/terms-of-service"
+        termsOfServiceAgree = "yes"
+    }
+}
+
 rootProject.name = 'mobibot'

From 153529029092fc398262b7a0eeef85a2e5c70fed Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 01:19:31 -0700
Subject: [PATCH 192/262] Implemented appendIfMissing and replaceEach extension
 functions to remove dependencies on StringUtils.

---
 .../net/thauvin/erik/mobibot/Mobibot.kt       |   9 +-
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  |  79 ++++++-------
 .../erik/mobibot/commands/tell/Tell.kt        |   2 +-
 .../thauvin/erik/mobibot/entries/EntryLink.kt |   9 +-
 .../erik/mobibot/modules/CurrencyConverter.kt |   3 +-
 .../erik/mobibot/modules/ModuleException.kt   |   8 +-
 .../net/thauvin/erik/mobibot/UtilsTest.kt     | 107 ++++++++++++++----
 7 files changed, 143 insertions(+), 74 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 0cb7100..c532b4b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -34,11 +34,11 @@ package net.thauvin.erik.mobibot
 import net.thauvin.erik.mobibot.PinboardUtils.addPin
 import net.thauvin.erik.mobibot.PinboardUtils.deletePin
 import net.thauvin.erik.mobibot.PinboardUtils.updatePin
+import net.thauvin.erik.mobibot.Utils.appendIfMissing
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.colorize
 import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.Utils.toDir
 import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
 import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.commands.AddLog
@@ -95,6 +95,7 @@ import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
 import org.jibble.pircbot.PircBot
 import java.io.BufferedOutputStream
+import java.io.File
 import java.io.FileNotFoundException
 import java.io.FileOutputStream
 import java.io.IOException
@@ -586,7 +587,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                     }
                     val nickname = p.getProperty("nick", Mobibot::class.java.name.lowercase())
                     val channel = p.getProperty("channel")
-                    val logsDir = p.getProperty("logs", ".").toDir()
+                    val logsDir = p.getProperty("logs", ".").appendIfMissing(File.separatorChar)
 
                     // Redirect stdout and stderr
                     if (!commandLine.hasOption(Constants.DEBUG_ARG[0])) {
@@ -656,14 +657,14 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
 
         // Set the URLs
         weblogUrl = p.getProperty("weblog", "")
-        backlogsUrl = p.getProperty("backlogs", weblogUrl).toDir(true)
+        backlogsUrl = p.getProperty("backlogs", weblogUrl).appendIfMissing('/')
 
         // Load the current entries and backlogs, if any
         try {
             LinksMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, this.channel)
             if (logger.isDebugEnabled) logger.debug("Last feed: ${LinksMgr.startDate}")
         } catch (e: Exception) {
-            logger.error("An error occurred while loading the logs.", e)
+            if (logger.isErrorEnabled) logger.error("An error occurred while loading the logs.", e)
         }
 
         // Set the pinboard authentication
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 60895b3..a1545b1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -31,7 +31,6 @@
  */
 package net.thauvin.erik.mobibot
 
-import org.apache.commons.lang3.StringUtils
 import org.jibble.pircbot.Colors
 import org.jsoup.Jsoup
 import java.io.BufferedReader
@@ -56,6 +55,18 @@ import java.util.stream.Collectors
 object Utils {
     private val searchFlags = arrayOf("%c", "%n")
 
+    /**
+     * Appends a suffix to the end of the String if not present.
+     */
+    @JvmStatic
+    fun String.appendIfMissing(suffix: Char) : String {
+        return if (this.last() != suffix) {
+            "$this${suffix}"
+        } else {
+            this
+        }
+    }
+
     /**
      * Makes the given int bold.
      */
@@ -81,7 +92,7 @@ object Utils {
     @JvmStatic
     fun buildCmdSyntax(text: String, botNick: String, isPrivate: Boolean): String {
         val replace = arrayOf(if (isPrivate) "/msg $botNick" else "$botNick:", botNick)
-        return StringUtils.replaceEach(text, searchFlags, replace)
+        return text.replaceEach(searchFlags, replace)
     }
 
     /**
@@ -95,7 +106,7 @@ object Utils {
      */
     @JvmStatic
     fun colorize(s: String?, color: String): String {
-        return if (s.isNullOrBlank()) {
+        return if (s.isNullOrEmpty()) {
             Colors.NORMAL
         } else if (Colors.BOLD == color || Colors.REVERSE == color) {
             color + s + color
@@ -136,7 +147,8 @@ object Utils {
     @JvmStatic
     @JvmOverloads
     fun helpFormat(help: String, isBold: Boolean = true, isIndent: Boolean = true): String {
-        return (if (isIndent) "    " else "").plus(if (isBold) bold(help) else help)
+        val s = if (isBold) bold(help) else help
+        return if (isIndent) s.prependIndent() else s
     }
 
     /**
@@ -145,21 +157,16 @@ object Utils {
     @JvmStatic
     fun String.obfuscate(): String {
         return if (this.isNotBlank()) {
-            StringUtils.repeat('x', this.length)
+            "x".repeat(this.length)
         } else this
     }
 
-    /**
-     * Returns the plural form of a word, if count &gt; 1.
-     */
-    fun String.plural(count: Int, plural: String): String = this.plural(count.toLong(), plural)
-
     /**
      * Returns the plural form of a word, if count &gt; 1.
      */
     @JvmStatic
-    fun String.plural(count: Long, plural: String): String {
-        return if (count > 1) plural else this
+    fun String.plural(count: Long): String {
+        return if (count > 1) "${this}s" else this
     }
 
     /**
@@ -168,6 +175,20 @@ object Utils {
     @JvmStatic
     fun red(s: String?): String = colorize(s, Colors.RED)
 
+    /**
+     * Replaces all occurrences of Strings within another String.
+     */
+    @JvmStatic
+    fun String.replaceEach(search: Array<out String>, replace: Array<out String>): String {
+        var result = this
+        if (search.size == replace.size) {
+            search.forEachIndexed { i, s ->
+                result = result.replace(s, replace[i])
+            }
+        }
+        return result
+    }
+
     /**
      * Makes the given string reverse color.
      */
@@ -180,26 +201,6 @@ object Utils {
     @JvmStatic
     fun today(): String = LocalDateTime.now().toIsoLocalDate()
 
-    /**
-     * Ensures that the given location (File/URL) has a trailing slash (`/`) to indicate a directory.
-     */
-    @JvmStatic
-    fun String.toDir(isUrl: Boolean = false): String {
-        return if (isUrl) {
-            if (this.last() == '/') {
-                this
-            } else {
-                "$this/"
-            }
-        } else {
-            if (this.last() == File.separatorChar) {
-                this
-            } else {
-                this + File.separatorChar
-            }
-        }
-    }
-
     /**
      * Converts a string to an int.
      */
@@ -266,21 +267,23 @@ object Utils {
 
         with(info) {
             if (years > 0) {
-                append(years).append(" year ".plural(years, " years "))
+                append(years).append(" year".plural(years)).append(' ')
             }
             if (months > 0) {
-                append(weeks).append(" month ".plural(months, " months "))
+                append(weeks).append(" month".plural(months)).append(' ')
             }
             if (weeks > 0) {
-                append(weeks).append(" week ".plural(weeks, " weeks "))
+                append(weeks).append(" week".plural(weeks)).append(' ')
             }
             if (days > 0) {
-                append(days).append(" day ".plural(days, " days "))
+                append(days).append(" day".plural(days)).append(' ')
             }
             if (hours > 0) {
-                append(hours).append(" hour ".plural(hours, " hours "))
+                append(hours).append(" hour".plural(hours)).append(' ')
             }
-            append(minutes).append(" minute ".plural(minutes, " minutes"))
+
+            append(minutes).append(" minute".plural(minutes))
+
             return toString()
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index 0792eaa..ddacd50 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -122,7 +122,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
         helpFormat("%c $name <nick> <message>"),
         "To view queued and sent messages:",
         helpFormat("%c $name ${View.VIEW_CMD}"),
-        "Messages are kept for ${bold(maxDays)}" + " day.".plural(maxDays, " days.")
+        "Messages are kept for ${bold(maxDays)}" + " day".plural(maxDays.toLong()) + '.'
     )
     override val isOp: Boolean = false
     override val isPublic: Boolean = isEnabled()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
index b87f777..1a8468f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -34,7 +34,6 @@ package net.thauvin.erik.mobibot.entries
 import com.rometools.rome.feed.synd.SyndCategory
 import com.rometools.rome.feed.synd.SyndCategoryImpl
 import net.thauvin.erik.mobibot.commands.links.LinksMgr
-import org.apache.commons.lang3.StringUtils
 import java.io.Serializable
 import java.util.Calendar
 import java.util.Date
@@ -144,9 +143,11 @@ class EntryLink : Serializable {
      * Returns true if a string is contained in the link, title, or nick.
      */
     fun matches(match: String?): Boolean {
-        return (StringUtils.containsIgnoreCase(link, match)
-                || StringUtils.containsIgnoreCase(title, match)
-                || StringUtils.containsIgnoreCase(nick, match))
+        return if (match.isNullOrEmpty()) {
+            false
+        } else {
+            link.contains(match, true) || title.contains(match, true) || nick.contains(match, true)
+        }
     }
 
     /**
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index b714e9a..54a3dc2 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -40,7 +40,6 @@ import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.PublicMessage
-import org.apache.commons.lang3.StringUtils
 import org.jdom2.JDOMException
 import org.jdom2.input.SAXBuilder
 import java.io.IOException
@@ -193,7 +192,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
             val rates = mutableListOf<String>()
             for ((key, value) in EXCHANGE_RATES) {
                 @Suppress("MagicNumber")
-                rates.add("  $key: ${StringUtils.leftPad(value, 8)}")
+                rates.add("  $key: ${value.padStart(8)}")
             }
             return rates
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
index 48a0462..5318787 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Utils.obfuscate
-import org.apache.commons.lang3.StringUtils
+import net.thauvin.erik.mobibot.Utils.replaceEach
 
 /**
  * The `ModuleException` class.
@@ -70,11 +70,11 @@ class ModuleException : Exception {
     fun getSanitizedMessage(vararg sanitize: String): String {
         val obfuscate = sanitize.map { it.obfuscate() }.toTypedArray()
         return when {
-            cause != null -> {
-                cause.javaClass.name + ": " + StringUtils.replaceEach(cause.message, sanitize, obfuscate)
+            cause?.message != null -> {
+                cause.javaClass.name + ": " + cause.message!!.replaceEach(sanitize, obfuscate)
             }
             message != null -> {
-                message.javaClass.name + ": " + StringUtils.replaceEach(message, sanitize, obfuscate)
+                message.javaClass.name + ": " + message.replaceEach(sanitize, obfuscate)
             }
             else -> ""
         }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 4978cbf..15a19e4 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -31,16 +31,21 @@
  */
 package net.thauvin.erik.mobibot
 
+import net.thauvin.erik.mobibot.Utils.appendIfMissing
 import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.colorize
 import net.thauvin.erik.mobibot.Utils.cyan
+import net.thauvin.erik.mobibot.Utils.encodeUrl
 import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.green
+import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.obfuscate
 import net.thauvin.erik.mobibot.Utils.plural
+import net.thauvin.erik.mobibot.Utils.red
+import net.thauvin.erik.mobibot.Utils.replaceEach
 import net.thauvin.erik.mobibot.Utils.reverseColor
-import net.thauvin.erik.mobibot.Utils.toDir
 import net.thauvin.erik.mobibot.Utils.toIntOrDefault
 import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
 import net.thauvin.erik.mobibot.Utils.toUtcDateTime
@@ -48,7 +53,6 @@ import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.Utils.unescapeXml
 import net.thauvin.erik.mobibot.Utils.uptime
 import net.thauvin.erik.mobibot.Utils.urlReader
-import org.apache.commons.lang3.StringUtils
 import org.assertj.core.api.Assertions.assertThat
 import org.jibble.pircbot.Colors
 import org.testng.annotations.BeforeClass
@@ -68,24 +72,47 @@ class UtilsTest {
         " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
     private val cal = Calendar.getInstance()
     private val localDateTime = LocalDateTime.of(1952, 2, 17, 12, 30, 0)
+    private val test = "This is a test."
 
     @BeforeClass
     fun setUp() {
         cal[1952, Calendar.FEBRUARY, 17, 12, 30] = 0
     }
 
+    @Test
+    fun testAppendIfMissing() {
+        val dir = "dir"
+        val sep = '/'
+        val url = "https://erik.thauvin.net"
+        assertThat(dir.appendIfMissing(File.separatorChar)).describedAs("appendIfMissing(dir)")
+            .isEqualTo(dir + File.separatorChar)
+        assertThat(url.appendIfMissing(sep)).describedAs("appendIfMissing(url)").isEqualTo("$url$sep")
+        assertThat("$url$sep".appendIfMissing(sep)).describedAs("appendIfMissing($url$sep)").isEqualTo("$url$sep")
+    }
+
     @Test
     fun testBold() {
         assertThat(bold(1)).describedAs("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
+        assertThat(bold(2L)).describedAs("bold(1)").isEqualTo(Colors.BOLD + "2" + Colors.BOLD)
         assertThat(bold(ascii)).describedAs("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
         assertThat(bold("test")).describedAs("bold(test)").isEqualTo(Colors.BOLD + "test" + Colors.BOLD)
-
     }
 
+    @Test
+    fun testBuildCmdSyntax() {
+        val bot = "mobibot"
+        assertThat(buildCmdSyntax("%c $test %n $test", bot, false)).describedAs("public")
+            .isEqualTo("$bot: $test $bot $test")
+        assertThat(buildCmdSyntax("%c %n $test %c $test %n", bot, true)).describedAs("public")
+            .isEqualTo("/msg $bot $bot $test /msg $bot $test $bot")
+    }
+
+
     @Test
     fun testCapitalise() {
         assertThat("test".capitalise()).describedAs("capitalize(test)").isEqualTo("Test")
         assertThat("Test".capitalise()).describedAs("capitalize(Test)").isEqualTo("Test")
+        assertThat(test.capitalise()).describedAs("capitalize($test)").isEqualTo(test)
         assertThat("".capitalise()).describedAs("capitalize()").isEqualTo("")
     }
 
@@ -99,6 +126,8 @@ class UtilsTest {
         assertThat(colorize(ascii, Colors.BOLD)).describedAs("colorized(bold)")
             .isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
         assertThat(colorize(null, Colors.RED)).describedAs("colorize(null)").isEqualTo(Colors.NORMAL)
+        assertThat(colorize("", Colors.RED)).describedAs("colorize()").isEqualTo(Colors.NORMAL)
+
     }
 
     @Test
@@ -106,13 +135,19 @@ class UtilsTest {
         assertThat(cyan(ascii)).isEqualTo(Colors.CYAN + ascii + Colors.NORMAL)
     }
 
+    @Test
+    fun testEncodeUrl() {
+        assertThat(encodeUrl("Hello Günter")).isEqualTo("Hello+G%C3%BCnter")
+    }
+
     @Test
     fun testGetIntProperty() {
         val p = Properties()
         p["one"] = "1"
-        p["two"] = "foo"
-        assertThat(p.getIntProperty("one", 1)).describedAs("getIntProperty(one)").isEqualTo(1)
+        p["two"] = "two"
+        assertThat(p.getIntProperty("one", 9)).describedAs("getIntProperty(one)").isEqualTo(1)
         assertThat(p.getIntProperty("two", 2)).describedAs("getIntProperty(two)").isEqualTo(2)
+        assertThat(p.getIntProperty("foo", 3)).describedAs("getIntProperty(foo)").isEqualTo(3)
     }
 
     @Test
@@ -120,6 +155,17 @@ class UtilsTest {
         assertThat(green(ascii)).isEqualTo(Colors.DARK_GREEN + ascii + Colors.NORMAL)
     }
 
+    @Test
+    fun testHelpFormat() {
+        assertThat(helpFormat(test, isBold = true, isIndent = false)).describedAs("bold")
+            .isEqualTo("${Colors.BOLD}$test${Colors.BOLD}")
+        assertThat(helpFormat(test, isBold = false, isIndent = true)).describedAs("indent")
+            .isEqualTo(test.prependIndent())
+        assertThat(helpFormat(test, isBold = true, isIndent = true)).describedAs("bold-indent")
+            .isEqualTo(colorize(test, Colors.BOLD).prependIndent())
+
+    }
+
     @Test
     fun testIsoLocalDate() {
         assertThat(cal.time.toIsoLocalDate()).describedAs("isoLocalDate(date)").isEqualTo("1952-02-17")
@@ -129,7 +175,7 @@ class UtilsTest {
     @Test
     fun testObfuscate() {
         assertThat(ascii.obfuscate().length).describedAs("obfuscate is right length").isEqualTo(ascii.length)
-        assertThat(ascii.obfuscate()).describedAs("obfuscate()").isEqualTo(StringUtils.repeat("x", ascii.length))
+        assertThat(ascii.obfuscate()).describedAs("obfuscate()").isEqualTo("x".repeat(ascii.length))
         assertThat(" ".obfuscate()).describedAs("obfuscate(blank)").isEqualTo(" ")
     }
 
@@ -137,10 +183,31 @@ class UtilsTest {
     fun testPlural() {
         val week = "week"
         val weeks = "weeks"
-        assertThat(week.plural(-1, weeks)).describedAs("plural(-1)").isEqualTo(week)
-        assertThat(week.plural(0, weeks)).describedAs("plural(0)").isEqualTo(week)
-        assertThat(week.plural(1, weeks)).describedAs("plural(1)").isEqualTo(week)
-        assertThat(week.plural(2, weeks)).describedAs("plural(2)").isEqualTo(weeks)
+
+        for (i in -1..3) {
+            assertThat(week.plural(i.toLong())).describedAs("plural($i)").isEqualTo(if (i > 1) weeks else week)
+        }
+    }
+
+    @Test
+    fun testReplaceEach() {
+        val search = arrayOf("one", "two", "three")
+        val replace = arrayOf("1", "2", "3")
+        assertThat(search.joinToString(",").replaceEach(search, replace)).describedAs("replaceEach(1,2,3")
+            .isEqualTo(replace.joinToString(","))
+
+        assertThat(test.replaceEach(search, replace)).describedAs("replaceEach(nothing)").isEqualTo(test)
+
+        assertThat(test.replaceEach(arrayOf("t", "e"), arrayOf("", "E"))).describedAs("replaceEach($test)")
+            .isEqualTo(test.replace("t", "").replace("e", "E"))
+
+        assertThat(test.replaceEach(search, emptyArray())).describedAs("replaceEach(search, empty)")
+            .isEqualTo(test)
+    }
+
+    @Test
+    fun testRed() {
+        assertThat(red(ascii)).isEqualTo(colorize(ascii, Colors.RED))
     }
 
     @Test
@@ -153,13 +220,6 @@ class UtilsTest {
         assertThat(today()).isEqualTo(LocalDateTime.now().toIsoLocalDate())
     }
 
-    @Test
-    fun testToDir() {
-        assertThat("dir".toDir(false)).describedAs("toDir(dir, false)").isEqualTo("dir" + File.separatorChar)
-        assertThat("https://erik.thauvin.net".toDir(true)).describedAs("toDir(erik.thauvin.net, true)")
-            .isEqualTo("https://erik.thauvin.net/")
-    }
-
     @Test
     fun testToIntOrDefault() {
         assertThat("10".toIntOrDefault(1)).describedAs("toIntOrDefault(10, 1)").isEqualTo(10)
@@ -175,16 +235,21 @@ class UtilsTest {
 
     @Test
     fun testUptime() {
-        assertThat("17 years 2 months 2 weeks 1 day 6 hours 45 minutes").isEqualTo(uptime(547800300076L))
+        assertThat(uptime(547800300076L)).describedAs("full")
+            .isEqualTo("17 years 2 months 2 weeks 1 day 6 hours 45 minutes")
+        assertThat(uptime(2700000L)).describedAs("minutes").isEqualTo("45 minutes")
+        assertThat(uptime(24300000L)).describedAs("hours minutes").isEqualTo("6 hours 45 minutes")
+        assertThat(uptime(110700000L)).describedAs("days hours minutes").isEqualTo("1 day 6 hours 45 minutes")
+        assertThat(uptime(1320300000L)).describedAs("weeks days hours minutes")
+            .isEqualTo("2 weeks 1 day 6 hours 45 minutes")
+        assertThat(uptime(0L)).describedAs("0 minutes").isEqualTo("0 minute")
     }
 
     @Test
     @Throws(IOException::class)
     fun testUrlReader() {
         assertThat(urlReader(URL("https://postman-echo.com/status/200"))).describedAs("urlReader()")
-            .isEqualTo(
-                "{\"status\":200}"
-            )
+            .isEqualTo("{\"status\":200}")
     }
 
     @Test

From af9546e3d1abd3a461b7faf99fe631ac3f2a5a3d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 01:26:12 -0700
Subject: [PATCH 193/262] Cleanup.

---
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  7 +--
 .../net/thauvin/erik/mobibot/commands/Nick.kt |  2 +-
 .../thauvin/erik/mobibot/commands/Users.kt    | 18 +++----
 .../erik/mobibot/entries/EntriesMgr.kt        |  4 +-
 .../erik/mobibot/modules/CryptoPrices.kt      | 14 +++---
 .../net/thauvin/erik/mobibot/modules/Dice.kt  |  2 +-
 .../net/thauvin/erik/mobibot/modules/Joke.kt  | 12 +++--
 .../erik/mobibot/modules/StockQuote.kt        | 47 ++++++++++++++-----
 .../thauvin/erik/mobibot/modules/Weather2.kt  | 36 +++++++-------
 .../thauvin/erik/mobibot/modules/WorldTime.kt | 10 ++--
 10 files changed, 94 insertions(+), 58 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
index ce4fd32..69e9688 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -54,11 +54,8 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
         "To toggle your ignore status:",
         helpFormat("%c $name $me")
     )
-    private val helpOp = listOf(
-        "To ignore a link posted to the channel:",
-        helpFormat("https://www.foo.bar " + bold("%n"), false),
-        "To add/remove nicks from the ignored list:",
-        helpFormat("%c $name <nick> [<nick> ...]")
+    private val helpOp = help.plus(
+        arrayOf("To add/remove nicks from the ignored list:", helpFormat("%c $name <nick> [<nick> ...]"))
     )
 
     override val isOp = false
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
index b4495b3..2f956e2 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -37,7 +37,7 @@ import net.thauvin.erik.mobibot.Utils.helpFormat
 
 class Nick(bot: Mobibot) : AbstractCommand(bot) {
     override val name = "nick"
-    override val help = listOf("To change the bot's nickname:", helpFormat("%c $name <nick>"))
+    override val help = listOf("To change the bot's nickname:", helpFormat("%c $name <new_nick>"))
     override val isOp = true
     override val isPublic = true
     override val isVisible = true
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
index 4db1781..de83bdf 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
@@ -51,15 +51,17 @@ class Users(bot: Mobibot) : AbstractCommand(bot) {
         isPrivate: Boolean
     ) {
         val nicks = mutableListOf<String>()
-        bot.getUsers(bot.channel).forEach { user ->
-            if (bot.isOp(user.nick)) {
-                nicks.add("@${user.nick}")
-            } else {
-                nicks.add(user.nick)
+        with(bot) {
+            getUsers(channel).forEach { user ->
+                if (isOp(user.nick)) {
+                    nicks.add("@${user.nick}")
+                } else {
+                    nicks.add(user.nick)
+                }
             }
-        }
 
-        @Suppress("MagicNumber")
-        bot.sendList(sender, nicks.sorted(), 8, isPrivate, isIndent = true)
+            @Suppress("MagicNumber")
+            sendList(sender, nicks.sorted(), 8, isPrivate, isIndent = true)
+        }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
index 6f9ffff..6fe809b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
@@ -114,7 +114,9 @@ object EntriesMgr {
                 output.output(rss, fw)
             }
         } else {
-            bot.logger.warn("Unable to generate the backlogs feed. No property configured.")
+            if (bot.logger.isErrorEnabled) {
+                bot.logger.warn("Unable to generate the backlogs feed. No property configured.")
+            }
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index c4b2fcd..db28550 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -87,11 +87,13 @@ class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
 
     init {
         commands.add(CRYPTO_CMD)
-        help.add("To retrieve a cryptocurrency's market price:")
-        help.add(helpFormat("%c $CRYPTO_CMD <symbol> [<currency>]"))
-        help.add("For example:")
-        help.add(helpFormat("%c $CRYPTO_CMD BTC"))
-        help.add(helpFormat("%c $CRYPTO_CMD ETH EUR"))
-        help.add(helpFormat("%c $CRYPTO_CMD ETH2 GPB"))
+        with(help) {
+            add("To retrieve a cryptocurrency's market price:")
+            add(helpFormat("%c $CRYPTO_CMD <symbol> [<currency>]"))
+            add("For example:")
+            add(helpFormat("%c $CRYPTO_CMD BTC"))
+            add(helpFormat("%c $CRYPTO_CMD ETH EUR"))
+            add(helpFormat("%c $CRYPTO_CMD ETH2 GPB"))
+        }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 46f788c..ec3a0e6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -75,7 +75,7 @@ class Dice(bot: Mobibot) : AbstractModule(bot) {
 
     private fun roll(): Pair<Int, Int> {
         @Suppress("MagicNumber")
-        return Pair(Random.nextInt(1, 7), Random.nextInt(1, 7))
+        return Random.nextInt(1, 7) to Random.nextInt(1, 7)
     }
 
     companion object {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
index f2624ec..40b6fc0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -59,11 +59,13 @@ class Joke(bot: Mobibot) : ThreadedModule(bot) {
      * Returns a random joke from [The Internet Chuck Norris Database](http://www.icndb.com/).
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        try {
-            bot.send(cyan(randomJoke().msg))
-        } catch (e: ModuleException) {
-            if (bot.logger.isWarnEnabled) bot.logger.warn(e.debugMessage, e)
-            bot.send(sender, e.message, isPrivate)
+        with(bot) {
+            try {
+                send(cyan(randomJoke().msg))
+            } catch (e: ModuleException) {
+                if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
+                send(sender, e.message, isPrivate)
+            }
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 1459914..e00838d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -51,7 +51,7 @@ import java.net.URL
  */
 class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
     /**
-     * Returns the specified stock quote from Alpha Avantage.
+     * Returns the specified stock quote from Alpha Vantage.
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
         with(bot) {
@@ -163,27 +163,52 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                                 add(ErrorMessage(INVALID_SYMBOL))
                                 return messages
                             }
+
                             add(
                                 PublicMessage(
                                     "Symbol: " + unescapeXml(quote.getString("01. symbol"))
                                             + " [" + unescapeXml(symbolInfo.getString("2. name")) + ']'
                                 )
                             )
-                            add(PublicMessage("    Price:     " + unescapeXml(quote.getString("05. price"))))
-                            add(PublicMessage("    Previous:  " + unescapeXml(quote.getString("08. previous close"))))
-                            add(NoticeMessage("    Open:      " + unescapeXml(quote.getString("02. open"))))
-                            add(NoticeMessage("    High:      " + unescapeXml(quote.getString("03. high"))))
-                            add(NoticeMessage("    Low:       " + unescapeXml(quote.getString("04. low"))))
-                            add(NoticeMessage("    Volume:    " + unescapeXml(quote.getString("06. volume"))))
+
+                            @Suppress("MagicNumber")
+                            val pad = 10
+
                             add(
-                                NoticeMessage(
-                                    "    Latest:    " + unescapeXml(quote.getString("07. latest trading day"))
+                                PublicMessage(
+                                    "Price:".padEnd(pad).prependIndent()
+                                            + unescapeXml(quote.getString("05. price"))
                                 )
                             )
+                            add(
+                                PublicMessage(
+                                    "Previous:".padEnd(pad).prependIndent()
+                                            + unescapeXml(quote.getString("08. previous close"))
+                                )
+                            )
+
+                            val data = arrayOf(
+                                "Open" to "02. open",
+                                "High" to "03. high",
+                                "Low" to  "04. low",
+                                "Volume" to "06. volume",
+                                "Latest" to "07. latest trading day"
+                            )
+
+                            data.forEach {
+                                add(
+                                    NoticeMessage(
+                                        "${it.first}:".padEnd(pad).prependIndent(),
+                                        unescapeXml(quote.getString(it.second))
+                                    )
+                                )
+                            }
+
                             add(
                                 NoticeMessage(
-                                    "    Change:    " + unescapeXml(quote.getString("09. change")) + " ["
-                                            + unescapeXml(quote.getString("10. change percent")) + ']'
+                                    "Change:".padEnd(pad).prependIndent()
+                                            + unescapeXml(quote.getString("09. change"))
+                                            + " [" + unescapeXml(quote.getString("10. change percent")) + ']'
                                 )
                             )
                         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index b1f7d3e..9ae9e50 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -56,18 +56,20 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
      */
     override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
         if (args.isNotBlank()) {
-            try {
-                val messages = getWeather(args, properties[OWM_API_KEY_PROP])
-                if (messages[0].isError) {
-                    helpResponse(sender, isPrivate)
-                } else {
-                    for (msg in messages) {
-                        bot.send(sender, msg)
+            with(bot) {
+                try {
+                    val messages = getWeather(args, properties[OWM_API_KEY_PROP])
+                    if (messages[0].isError) {
+                        helpResponse(sender, isPrivate)
+                    } else {
+                        for (msg in messages) {
+                            send(sender, msg)
+                        }
                     }
+                } catch (e: ModuleException) {
+                    if (logger.isDebugEnabled) logger.debug(e.debugMessage, e)
+                    send(e.message)
                 }
-            } catch (e: ModuleException) {
-                if (bot.logger.isDebugEnabled) bot.logger.debug(e.debugMessage, e)
-                bot.send(e.message)
             }
         } else {
             helpResponse(sender, isPrivate)
@@ -174,7 +176,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                             }
                         }
                     } catch (e: APIException) {
-                        throw ModuleException("getWeather($query)", "Unable to perform weather lookup.", e)
+                        throw ModuleException("getWeather($query)", "A weather API error has occurred.", e)
                     } catch (e: NullPointerException) {
                         throw ModuleException("getWeather($query)", "Unable to perform weather lookup.", e)
                     }
@@ -195,11 +197,13 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
 
     init {
         commands.add(WEATHER_CMD)
-        help.add("To display weather information:")
-        help.add(helpFormat("%c $WEATHER_CMD <city> [, <country code>]"))
-        help.add("For example:")
-        help.add(helpFormat("%c $WEATHER_CMD paris, fr"))
-        help.add("The default ISO 3166 country code is ${bold("US")}. Zip codes supported in most countries.")
+        with(help) {
+            add("To display weather information:")
+            add(helpFormat("%c $WEATHER_CMD <city> [, <country code>]"))
+            add("For example:")
+            add(helpFormat("%c $WEATHER_CMD paris, fr"))
+            add("The default ISO 3166 country code is ${bold("US")}. Zip codes supported in most countries.")
+        }
         initProperties(OWM_API_KEY_PROP)
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 0837590..a9be03d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -211,10 +211,12 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
     override val isPrivateMsgEnabled = true
 
     init {
-        help.add("To display a country's current date/time:")
-        help.add(helpFormat("%c $TIME_CMD [<country code>]"))
-        help.add("For a listing of the supported countries:")
-        help.add(helpFormat("%c $TIME_CMD"))
+        with(help) {
+            add("To display a country's current date/time:")
+            add(helpFormat("%c $TIME_CMD [<country code>]"))
+            add("For a listing of the supported countries:")
+            add(helpFormat("%c $TIME_CMD"))
+        }
         commands.add(TIME_CMD)
     }
 }

From 04e88264cd730ec836d8927e096bfe124ea12c50 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 01:26:52 -0700
Subject: [PATCH 194/262] Cleaned up and added more tests.

---
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  |  2 +-
 .../erik/mobibot/modules/StockQuote.kt        |  4 +--
 .../net/thauvin/erik/mobibot/msg/Message.kt   |  4 +++
 .../thauvin/erik/mobibot/PinboardUtilsTest.kt | 20 +++++++++----
 .../mobibot/commands/tell/TellMessageTest.kt  |  2 ++
 .../erik/mobibot/entries/EntryLinkTest.kt     | 30 +++++++++++++++++++
 .../mobibot/modules/ModuleExceptionTest.kt    | 21 +++++++++----
 .../erik/mobibot/modules/StockQuoteTest.kt    |  4 ++-
 version.properties                            |  6 ++--
 9 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index a1545b1..9c05336 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -106,7 +106,7 @@ object Utils {
      */
     @JvmStatic
     fun colorize(s: String?, color: String): String {
-        return if (s.isNullOrEmpty()) {
+        return if (s.isNullOrBlank()) {
             Colors.NORMAL
         } else if (Colors.BOLD == color || Colors.REVERSE == color) {
             color + s + color
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index e00838d..333d9d4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -198,8 +198,8 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                             data.forEach {
                                 add(
                                     NoticeMessage(
-                                        "${it.first}:".padEnd(pad).prependIndent(),
-                                        unescapeXml(quote.getString(it.second))
+                                        "${it.first}:".padEnd(pad).prependIndent()
+                                                + unescapeXml(quote.getString(it.second))
                                     )
                                 )
                             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
index 6cdf592..b62c1d9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
@@ -72,4 +72,8 @@ open class Message {
         this.isError = isError
         this.isPrivate = isPrivate
     }
+
+    override fun toString(): String {
+        return "Message(color='$color', isError=$isError, isNotice=$isNotice, isPrivate=$isPrivate, msg='$msg')"
+    }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index 7fcd726..d9c7354 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -51,11 +51,15 @@ class PinboardUtilsTest : LocalProperties() {
         val entry = EntryLink(url, "Test Example", "ErikT", "", "#mobitopia", listOf("test"))
 
         PinboardUtils.addPin(pinboard, ircServer, entry)
-        assertTrue(validatePin(apiToken, ircServer, entry.link), "addPin")
-        entry.link = "https://www.foo.com/"
+        assertTrue(validatePin(apiToken, url = entry.link, entry.title, entry.nick, entry.channel), "addPin")
 
+        entry.link = "https://www.foo.com/"
         PinboardUtils.updatePin(pinboard, ircServer, url, entry)
-        assertTrue(validatePin(apiToken, ircServer, entry.link), "updatePin")
+        assertTrue(validatePin(apiToken, url = entry.link, ircServer), "updatePin")
+
+        entry.title = "Foo Title"
+        PinboardUtils.updatePin(pinboard, ircServer, entry.link, entry)
+        assertTrue(validatePin(apiToken, url = entry.link, entry.title), "update title")
 
         PinboardUtils.deletePin(pinboard, entry)
         assertFalse(validatePin(apiToken, url = entry.link), "deletePin")
@@ -67,7 +71,7 @@ class PinboardUtilsTest : LocalProperties() {
         assertTrue(d.toTimestamp().matches("[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z".toRegex()))
     }
 
-    private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean {
+    private fun validatePin(apiToken: String, url: String, vararg matches: String): Boolean {
         val response = Utils.urlReader(
             URL(
                 "https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
@@ -75,6 +79,12 @@ class PinboardUtilsTest : LocalProperties() {
             )
         )
 
-        return response.contains(url) && response.contains(ircServer)
+        matches.forEach {
+            if (!response.contains(it)) {
+                return false
+            }
+        }
+
+        return response.contains(url)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index 4fdd2db..7f5de32 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -58,6 +58,8 @@ class TellMessageTest {
         assertThat(tellMessage.isMatch(sender)).describedAs("match sender").isTrue
         assertThat(tellMessage.isMatch(recipient)).describedAs("match recipient").isTrue
         assertThat(tellMessage.isMatch("foo")).describedAs("foo is no match").isFalse
+        tellMessage.isReceived = false
+        assertThat(tellMessage.receptionDate).describedAs("reception date not set").isEqualTo(LocalDateTime.MIN)
         tellMessage.isReceived = true
         assertThat(tellMessage.isReceived).describedAs("is received").isTrue
         assertThat(isValidDate(tellMessage.receptionDate)).describedAs("received is valid date/time").isTrue
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
index b6a83dc..3af8f40 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -32,9 +32,11 @@
 package net.thauvin.erik.mobibot.entries
 
 import com.rometools.rome.feed.synd.SyndCategory
+import com.rometools.rome.feed.synd.SyndCategoryImpl
 import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 import java.security.SecureRandom
+import java.util.Date
 
 /**
  * The `EntryUtilsTest` class.
@@ -74,6 +76,29 @@ class EntryLinkTest {
         assertThat(entryLink.getComment(0).comment).describedAs("getComment(something)").isEqualTo("something")
     }
 
+    @Test
+    fun testConstructor() {
+        val tag = "test"
+        val tags = listOf(SyndCategoryImpl().apply { name = tag })
+        val link = EntryLink("link", "title", "nick", "channel", Date(), tags)
+        assertThat(link.tags.size).describedAs("check tag size").isEqualTo(tags.size)
+        assertThat(link.tags[0].name).describedAs("check tag name").isEqualTo(tag)
+        assertThat(link.pinboardTags).describedAs("check pinboard tag").isEqualTo("nick,$tag")
+    }
+
+    @Test
+    fun testMatches() {
+        assertThat(entryLink.matches("mobitopia")).describedAs("match mobitopia").isTrue
+        assertThat(entryLink.matches("skynx")).describedAs("match nick").isTrue
+        assertThat(entryLink.matches("www.mobitopia.org")).describedAs("match url").isTrue
+        assertThat(entryLink.matches("foo")).describedAs("match foo").isFalse
+        assertThat(entryLink.matches("")).describedAs("match empty").isFalse
+        assertThat(entryLink.matches(null)).describedAs("match null").isFalse
+
+
+    }
+
+
     @Test
     fun testTags() {
         val tags: List<SyndCategory> = entryLink.tags
@@ -88,5 +113,10 @@ class EntryLinkTest {
         entryLink.setTags("-mobitopia")
         assertThat(entryLink.pinboardTags).describedAs("getPinboardTags()")
             .isEqualTo(entryLink.nick + ",tag1,tag2,tag3,tag4,mobitopia")
+        val size = entryLink.tags.size
+        entryLink.setTags("")
+        assertThat(entryLink.tags.size).describedAs("empty tag").isEqualTo(size)
+        entryLink.setTags("    ")
+        assertThat(entryLink.tags.size).describedAs("blank tag").isEqualTo(size)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
index c2d61e3..4e63def 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
@@ -31,7 +31,7 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import org.assertj.core.api.Assertions
+import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.DataProvider
 import org.testng.annotations.Test
 import java.io.IOException
@@ -57,19 +57,30 @@ class ModuleExceptionTest {
 
     @Test(dataProvider = "dp")
     fun testGetDebugMessage(e: ModuleException) {
-        Assertions.assertThat(e.debugMessage).describedAs("get debug message").isEqualTo(debugMessage)
+        assertThat(e.debugMessage).describedAs("get debug message").isEqualTo(debugMessage)
     }
 
     @Test(dataProvider = "dp")
     fun testGetMessage(e: ModuleException) {
-        Assertions.assertThat(e.message).describedAs("get message").isEqualTo(message)
+        assertThat(e.message).describedAs("get message").isEqualTo(message)
     }
 
     @Test
     fun testGetSanitizedMessage() {
         val apiKey = "1234567890"
-        val e = ModuleException(debugMessage, message, IOException("URL http://foo.com?apiKey=$apiKey&userID=me"))
-        Assertions.assertThat(e.getSanitizedMessage(apiKey)).describedAs("sanitized url")
+        var e = ModuleException(debugMessage, message, IOException("URL http://foo.com?apiKey=$apiKey&userID=me"))
+        assertThat(e.getSanitizedMessage(apiKey)).describedAs("sanitized url")
             .contains("xxxxxxxxxx").doesNotContain(apiKey)
+
+        e = ModuleException(debugMessage, message, null)
+        assertThat(e.getSanitizedMessage(apiKey)).describedAs("no cause").contains(message)
+
+        val msg: String? = null
+        e = ModuleException(debugMessage, msg, IOException(msg))
+        assertThat(e.getSanitizedMessage(apiKey)).describedAs("no message").isEqualTo("")
+
+
+        e = ModuleException(msg, msg, IOException(apiKey))
+        assertThat(e.getSanitizedMessage(apiKey)).describedAs("null message").doesNotContain(apiKey)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index 60875cf..7f46935 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -49,7 +49,9 @@ class StockQuoteTest : LocalProperties() {
             val messages = getQuote("apple inc", apiKey)
             assertThat(messages).describedAs("response not empty").isNotEmpty
             assertThat(messages[0].msg).describedAs("same stock symbol").startsWith("Symbol: AAPL")
-            assertThat(messages[1].msg).describedAs("price label").startsWith("    Price:     ")
+            assertThat(messages[1].msg).describedAs("price label").startsWith("Price:    ".prependIndent())
+            assertThat(messages[2].msg).describedAs("previous label").startsWith("Previous: ".prependIndent())
+            assertThat(messages[3].msg).describedAs("open label").startsWith("Open:     ".prependIndent())
             try {
                 getQuote("blahfoo", apiKey)
             } catch (e: ModuleException) {
diff --git a/version.properties b/version.properties
index a78c1d5..6cb4e53 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Thu Jul 08 12:26:26 PDT 2021
-version.buildmeta=930
+#Fri Jul 30 02:43:43 PDT 2021
+version.buildmeta=1111
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+930
+version.semver=0.8.0-beta+1111

From 00caee4bc1f3b006e18f112388bfee4dbae4139a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 03:25:45 -0700
Subject: [PATCH 195/262] Fixed colorize function.

---
 src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt      | 10 ++++++----
 .../kotlin/net/thauvin/erik/mobibot/msg/Message.kt     |  3 ++-
 src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt  |  9 ++++++---
 version.properties                                     |  6 +++---
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 9c05336..e671380 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -31,10 +31,10 @@
  */
 package net.thauvin.erik.mobibot
 
+import net.thauvin.erik.mobibot.msg.Message.Companion.DEFAULT_COLOR
 import org.jibble.pircbot.Colors
 import org.jsoup.Jsoup
 import java.io.BufferedReader
-import java.io.File
 import java.io.IOException
 import java.io.InputStreamReader
 import java.net.URL
@@ -59,7 +59,7 @@ object Utils {
      * Appends a suffix to the end of the String if not present.
      */
     @JvmStatic
-    fun String.appendIfMissing(suffix: Char) : String {
+    fun String.appendIfMissing(suffix: Char): String {
         return if (this.last() != suffix) {
             "$this${suffix}"
         } else {
@@ -106,8 +106,10 @@ object Utils {
      */
     @JvmStatic
     fun colorize(s: String?, color: String): String {
-        return if (s.isNullOrBlank()) {
-            Colors.NORMAL
+        return if (s.isNullOrEmpty()) {
+            ""
+        } else if (color == DEFAULT_COLOR) {
+            s
         } else if (Colors.BOLD == color || Colors.REVERSE == color) {
             color + s + color
         } else {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
index b62c1d9..c1ced5f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
@@ -31,6 +31,7 @@
  */
 package net.thauvin.erik.mobibot.msg
 
+import net.thauvin.erik.semver.Constants
 import org.jibble.pircbot.Colors
 
 /**
@@ -38,7 +39,7 @@ import org.jibble.pircbot.Colors
  */
 open class Message {
     companion object {
-        var DEFAULT_COLOR = Colors.NORMAL
+        var DEFAULT_COLOR = Constants.EMPTY
     }
 
     /** Message color. */
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 15a19e4..905b32f 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -53,6 +53,7 @@ import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.Utils.unescapeXml
 import net.thauvin.erik.mobibot.Utils.uptime
 import net.thauvin.erik.mobibot.Utils.urlReader
+import net.thauvin.erik.mobibot.msg.Message.Companion.DEFAULT_COLOR
 import org.assertj.core.api.Assertions.assertThat
 import org.jibble.pircbot.Colors
 import org.testng.annotations.BeforeClass
@@ -125,9 +126,11 @@ class UtilsTest {
             .isEqualTo(Colors.RED + ascii + Colors.NORMAL)
         assertThat(colorize(ascii, Colors.BOLD)).describedAs("colorized(bold)")
             .isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
-        assertThat(colorize(null, Colors.RED)).describedAs("colorize(null)").isEqualTo(Colors.NORMAL)
-        assertThat(colorize("", Colors.RED)).describedAs("colorize()").isEqualTo(Colors.NORMAL)
-
+        assertThat(colorize(null, Colors.RED)).describedAs("colorize(null)").isEqualTo("")
+        assertThat(colorize("", Colors.RED)).describedAs("colorize()").isEqualTo("")
+        assertThat(colorize(ascii, DEFAULT_COLOR)).describedAs("colorize(none)").isEqualTo(ascii)
+        assertThat(colorize("   ", Colors.NORMAL)).describedAs("colorize(blank)")
+            .isEqualTo(Colors.NORMAL + "   " + Colors.NORMAL)
     }
 
     @Test
diff --git a/version.properties b/version.properties
index 6cb4e53..3ad6de0 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Jul 30 02:43:43 PDT 2021
-version.buildmeta=1111
+#Fri Jul 30 03:23:18 PDT 2021
+version.buildmeta=1115
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+1111
+version.semver=0.8.0-beta+1115

From d05499a76f0e401a130dd88e8053887b009b3db3 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 12:23:52 -0700
Subject: [PATCH 196/262] Cleaned up and added test to messages.

---
 .../thauvin/erik/mobibot/msg/ErrorMessage.kt  |  1 -
 .../net/thauvin/erik/mobibot/msg/Message.kt   | 13 ++++-
 .../thauvin/erik/mobibot/msg/TestMessage.kt   | 55 +++++++++++++++++++
 3 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
index 96ef549..741d557 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
@@ -39,6 +39,5 @@ class ErrorMessage @JvmOverloads constructor(msg: String, color: String = DEFAUL
         this.msg = msg
         this.color = color
         isError = true
-        isNotice = true
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
index c1ced5f..b410663 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
@@ -32,7 +32,6 @@
 package net.thauvin.erik.mobibot.msg
 
 import net.thauvin.erik.semver.Constants
-import org.jibble.pircbot.Colors
 
 /**
  * The `Message` class.
@@ -47,6 +46,10 @@ open class Message {
 
     /** Error flag. */
     var isError = false
+        set(value) {
+            if (value) isNotice = value
+            field = value
+        }
 
     /** Notice flag. */
     var isNotice = false
@@ -66,7 +69,13 @@ open class Message {
      * Creates a new message.
      */
     @JvmOverloads
-    constructor(msg: String, color: String = DEFAULT_COLOR, isNotice: Boolean, isError: Boolean, isPrivate: Boolean) {
+    constructor(
+        msg: String,
+        color: String = DEFAULT_COLOR,
+        isNotice: Boolean = false,
+        isError: Boolean = false,
+        isPrivate: Boolean = false
+    ) {
         this.msg = msg
         this.color = color
         this.isNotice = isNotice
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
new file mode 100644
index 0000000..6ab62c9
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
@@ -0,0 +1,55 @@
+/*
+ * TestMessage.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.msg
+
+import org.assertj.core.api.Assertions.assertThat
+import org.testng.annotations.Test
+
+class TestMessage {
+    @Test
+    fun testConstructor() {
+        var msg = Message()
+
+        msg.isError = true
+        assertThat(msg.isNotice).describedAs("message is notice").isTrue
+
+        msg = Message("foo", isError = true)
+        assertThat(msg.isNotice).describedAs("message is notice too").isTrue
+    }
+
+    @Test
+    fun testErrorMessage() {
+        val msg = ErrorMessage("foo")
+        assertThat(msg.isNotice).describedAs("error message is notice").isTrue
+    }
+}

From 1d15d669b1cb6f229d62b9358a32c824a2fa0e29 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 14:51:24 -0700
Subject: [PATCH 197/262] Fixed country code lookup and added more tests.

---
 .../thauvin/erik/mobibot/modules/Weather2.kt  | 38 +++++++++-----
 .../erik/mobibot/modules/Weather2Test.kt      | 51 ++++++++++++++++---
 2 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index 9ae9e50..ecdd1b1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -84,21 +84,28 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
 
         // Weather command
         private const val WEATHER_CMD = "weather"
-        private fun getCountry(countryCode: String): Country {
+
+        /**
+         * Converts and rounds temperature from °F to °C.
+         */
+        fun ftoC(d: Double?): Pair<Int, Int> {
+            @Suppress("MagicNumber")
+            val c = (d!! - 32) * 5 / 9
+            return d.roundToInt() to c.roundToInt()
+        }
+
+        /**
+         * Returns a country based on its country code. Defaults to [Country.UNITED_STATES] if not found.
+         */
+        fun getCountry(countryCode: String): Country {
             for (c in Country.values()) {
-                if (c.name.equals(countryCode, ignoreCase = true)) {
+                if (c.value.equals(countryCode, ignoreCase = true)) {
                     return c
                 }
             }
             return Country.UNITED_STATES
         }
 
-        private fun getTemps(d: Double?): String {
-            @Suppress("MagicNumber")
-            val c = (d!! - 32) * 5 / 9
-            return "${d.roundToInt()} °F, ${c.roundToInt()} °C"
-        }
-
         /**
          * Retrieves the weather data.
          */
@@ -131,7 +138,8 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                             with(cwd.mainData) {
                                 if (this != null) {
                                     if (hasTemp()) {
-                                        messages.add(PublicMessage("Temperature: ${getTemps(temp)}"))
+                                        val t = ftoC(temp)
+                                        messages.add(PublicMessage("Temperature: ${t.first}°F, ${t.second}°C"))
                                     }
                                     if (hasHumidity() && humidity != null) {
                                         messages.add(NoticeMessage("Humidity: ${(humidity!!).roundToInt()}%"))
@@ -141,7 +149,8 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                             if (cwd.hasWindData()) {
                                 with(cwd.windData) {
                                     if (this != null && hasSpeed() && speed != null) {
-                                        messages.add(NoticeMessage("Wind: ${wind(speed!!)}"))
+                                        val w = mphToKmh(speed!!)
+                                        messages.add(NoticeMessage("Wind: ${w.first} mph, ${w.second} km/h"))
                                     }
                                 }
                             }
@@ -176,7 +185,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                             }
                         }
                     } catch (e: APIException) {
-                        throw ModuleException("getWeather($query)", "A weather API error has occurred.", e)
+                        throw ModuleException("getWeather($query)", "A weather API error has occurred: ${e.message}", e)
                     } catch (e: NullPointerException) {
                         throw ModuleException("getWeather($query)", "Unable to perform weather lookup.", e)
                     }
@@ -188,10 +197,13 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
             return messages
         }
 
-        private fun wind(w: Double): String {
+        /**
+         * Converts and rounds temperature from mph to km/h.
+         */
+        fun mphToKmh(w: Double): Pair<Int, Int> {
             @Suppress("MagicNumber")
             val kmh = w * 1.60934
-            return "${w.roundToInt()} mph, ${kmh.roundToInt()} km/h"
+            return w.roundToInt() to kmh.roundToInt()
         }
     }
 
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
index 23d9b16..aead144 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
@@ -32,29 +32,68 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.aksingh.owmjapis.api.APIException
+import net.aksingh.owmjapis.core.OWM
 import net.thauvin.erik.mobibot.LocalProperties
+import net.thauvin.erik.mobibot.modules.Weather2.Companion.OWM_API_KEY_PROP
+import net.thauvin.erik.mobibot.modules.Weather2.Companion.ftoC
+import net.thauvin.erik.mobibot.modules.Weather2.Companion.getCountry
 import net.thauvin.erik.mobibot.modules.Weather2.Companion.getWeather
+import net.thauvin.erik.mobibot.modules.Weather2.Companion.mphToKmh
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
+import kotlin.random.Random
 
 /**
  * The `Weather2Test` class.
  */
 class Weather2Test : LocalProperties() {
+    @Test
+    fun testFtoC() {
+        val t = ftoC(32.0)
+        assertThat(t.second).describedAs("32 °F is 0 °C").isEqualTo(0)
+    }
+
+    @Test
+    fun testGetCountry() {
+        assertThat(getCountry("foo")).describedAs("not a country").isEqualTo(OWM.Country.UNITED_STATES)
+        assertThat(getCountry("fr")).describedAs("fr is france").isEqualTo(OWM.Country.FRANCE)
+
+        val country = OWM.Country.values()
+        repeat(3) {
+            val rand = country[Random.nextInt(0, country.size - 1)]
+            assertThat(getCountry(rand.value)).describedAs(rand.name).isEqualTo(rand)
+        }
+    }
+
+    @Test
+    fun testMphToKmh() {
+        val w = mphToKmh(0.62)
+        assertThat(w.second).describedAs("0.62 mph is 1 km/h").isEqualTo(1)
+    }
+
     @Test
     @Throws(ModuleException::class)
     fun testWeather() {
-        var messages = getWeather("98204", getProperty(Weather2.OWM_API_KEY_PROP))
+        var messages = getWeather("98204", getProperty(OWM_API_KEY_PROP))
         assertThat(messages[0].msg).describedAs("is Everett").contains("Everett").contains("US")
-        assertThat(messages[messages.size - 1].msg).describedAs("is City Search").endsWith("98204%2CUS")
-        messages = getWeather("London, UK", getProperty(Weather2.OWM_API_KEY_PROP))
+        assertThat(messages[messages.size - 1].msg).describedAs("is Everett zip code").endsWith("98204%2CUS")
+
+        messages = getWeather("San Francisco", getProperty(OWM_API_KEY_PROP))
+        assertThat(messages[0].msg).describedAs("is San Francisco").contains("San Francisco").contains("US")
+        assertThat(messages[messages.size - 1].msg).describedAs("is San Fran city code").endsWith("5391959")
+
+        messages = getWeather("London, UK", getProperty(OWM_API_KEY_PROP))
         assertThat(messages[0].msg).describedAs("is UK").contains("London").contains("UK")
-        assertThat(messages[messages.size - 1].msg).describedAs("is City Code").endsWith("4517009")
-        assertThatThrownBy { getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP)) }
-            .describedAs("Montpellier not found").hasCauseInstanceOf(APIException::class.java)
+        assertThat(messages[messages.size - 1].msg).describedAs("is London city code").endsWith("4517009")
+
+        assertThatThrownBy { getWeather("Foo, US", getProperty(OWM_API_KEY_PROP)) }
+            .describedAs("foo not found").hasCauseInstanceOf(APIException::class.java)
         assertThatThrownBy { getWeather("test", "") }
             .describedAs("no API key").isInstanceOf(ModuleException::class.java).hasNoCause()
+        assertThatThrownBy { getWeather("test", null) }
+            .describedAs("null API key").isInstanceOf(ModuleException::class.java).hasNoCause()
+
         messages = getWeather("", "apikey")
         assertThat(messages[0].isError).describedAs("no query").isTrue
     }

From 9f82690ec7f56ca95533bdb07876f9f644399eed Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 16:58:04 -0700
Subject: [PATCH 198/262] Sorted the currency rates.

---
 .../net/thauvin/erik/mobibot/modules/CurrencyConverter.kt     | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 54a3dc2..ecf214d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -190,7 +190,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         @JvmStatic
         fun currencyRates(): List<String> {
             val rates = mutableListOf<String>()
-            for ((key, value) in EXCHANGE_RATES) {
+            for ((key, value) in EXCHANGE_RATES.toSortedMap()) {
                 @Suppress("MagicNumber")
                 rates.add("  $key: ${value.padStart(8)}")
             }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
index 3af8f40..7b4c159 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -83,7 +83,7 @@ class EntryLinkTest {
         val link = EntryLink("link", "title", "nick", "channel", Date(), tags)
         assertThat(link.tags.size).describedAs("check tag size").isEqualTo(tags.size)
         assertThat(link.tags[0].name).describedAs("check tag name").isEqualTo(tag)
-        assertThat(link.pinboardTags).describedAs("check pinboard tag").isEqualTo("nick,$tag")
+        assertThat(link.pinboardTags).describedAs("check pinboard tags").isEqualTo("nick,$tag")
     }
 
     @Test
@@ -94,8 +94,6 @@ class EntryLinkTest {
         assertThat(entryLink.matches("foo")).describedAs("match foo").isFalse
         assertThat(entryLink.matches("")).describedAs("match empty").isFalse
         assertThat(entryLink.matches(null)).describedAs("match null").isFalse
-
-
     }
 
 

From 6f297a0d6b40a9dbdf12c445fad7cde57bc86494 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 18:33:09 -0700
Subject: [PATCH 199/262] Fixed country code.

---
 .../net/thauvin/erik/mobibot/modules/Weather2.kt    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index ecdd1b1..e3162f4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -122,19 +122,20 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                 val argv = query.split(",")
                 if (argv.size in 1..2) {
                     val city = argv[0].trim()
-                    val country: String = if (argv.size > 1 && argv[1].isNotBlank()) {
+                    val code: String = if (argv.size > 1 && argv[1].isNotBlank()) {
                         argv[1].trim()
                     } else {
                         "US"
                     }
                     try {
+                        val country = getCountry(code)
                         val cwd: CurrentWeather = if (city.matches("\\d+".toRegex())) {
-                            owm.currentWeatherByZipCode(city.toInt(), getCountry(country))
+                            owm.currentWeatherByZipCode(city.toInt(), country)
                         } else {
-                            owm.currentWeatherByCityName(city, getCountry(country))
+                            owm.currentWeatherByCityName(city, country)
                         }
                         if (cwd.hasCityName()) {
-                            messages.add(PublicMessage("City: ${cwd.cityName} [${country.uppercase()}]"))
+                            messages.add(PublicMessage("City: ${cwd.cityName} [${country.value}]"))
                             with(cwd.mainData) {
                                 if (this != null) {
                                     if (hasTemp()) {
@@ -177,7 +178,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                                     messages.add(
                                         NoticeMessage(
                                             "https://openweathermap.org/find?q="
-                                                    + encodeUrl("$city,${country.uppercase()}"),
+                                                    + encodeUrl("$city,${code.uppercase()}"),
                                             Colors.GREEN
                                         )
                                     )
@@ -185,7 +186,7 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                             }
                         }
                     } catch (e: APIException) {
-                        throw ModuleException("getWeather($query)", "A weather API error has occurred: ${e.message}", e)
+                        throw ModuleException("getWeather($query)", e.message, e)
                     } catch (e: NullPointerException) {
                         throw ModuleException("getWeather($query)", "Unable to perform weather lookup.", e)
                     }

From 79efd005d163ba48aa09b62390adcd3011f4f371 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 30 Jul 2021 18:33:56 -0700
Subject: [PATCH 200/262] Fixed me keyword use for ops.

---
 src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
index 69e9688..537b19c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -80,9 +80,9 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
         isOp: Boolean,
         isPrivate: Boolean
     ) {
-        if (!isOp) {
+        val isMe = args.trim().equals(me, true)
+        if (isMe || !isOp) {
             val nick = sender.lowercase()
-            val isMe = args.lowercase().startsWith(me)
             ignoreNick(bot, nick, isMe, isPrivate)
         } else {
             ignoreOp(bot, sender, args, isPrivate)

From aab28b59792d5863268d560b368d0368726bacc2 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 31 Jul 2021 14:23:43 -0700
Subject: [PATCH 201/262] Added capitalizeWords extension function.

---
 src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt        | 6 ++++++
 .../kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt  | 8 +++++++-
 src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt    | 9 +++++++++
 .../net/thauvin/erik/mobibot/modules/Weather2Test.kt     | 8 ++++----
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index e671380..986230a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -101,6 +101,12 @@ object Utils {
     @JvmStatic
     fun String.capitalise(): String = this.replaceFirstChar { it.uppercase() }
 
+    /**
+     * Capitalize words
+     */
+    fun String.capitalizeWords(): String = split(" ").map { it.lowercase().capitalise() }.joinToString(" ")
+
+
     /**
      * Colorize a string.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index e3162f4..ef6cb1f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -38,6 +38,7 @@ import net.aksingh.owmjapis.model.CurrentWeather
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.capitalise
+import net.thauvin.erik.mobibot.Utils.capitalizeWords
 import net.thauvin.erik.mobibot.Utils.encodeUrl
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.msg.ErrorMessage
@@ -135,7 +136,12 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
                             owm.currentWeatherByCityName(city, country)
                         }
                         if (cwd.hasCityName()) {
-                            messages.add(PublicMessage("City: ${cwd.cityName} [${country.value}]"))
+                            messages.add(
+                                PublicMessage(
+                                    "City: ${cwd.cityName}, " +
+                                            country.name.replace('_', ' ').capitalizeWords() + " [${country.value}]"
+                                )
+                            )
                             with(cwd.mainData) {
                                 if (this != null) {
                                     if (hasTemp()) {
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 905b32f..16434f2 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -35,6 +35,7 @@ import net.thauvin.erik.mobibot.Utils.appendIfMissing
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.capitalise
+import net.thauvin.erik.mobibot.Utils.capitalizeWords
 import net.thauvin.erik.mobibot.Utils.colorize
 import net.thauvin.erik.mobibot.Utils.cyan
 import net.thauvin.erik.mobibot.Utils.encodeUrl
@@ -117,6 +118,14 @@ class UtilsTest {
         assertThat("".capitalise()).describedAs("capitalize()").isEqualTo("")
     }
 
+    @Test
+    fun textCapitaliseWords() {
+        assertThat(test.capitalizeWords()).describedAs("captiatlizeWords(test)").isEqualTo("This Is A Test.")
+        assertThat("Already Capitalized".capitalizeWords()).describedAs("already capitalized")
+            .isEqualTo("Already Capitalized")
+        assertThat("    a  test  ".capitalizeWords()).describedAs("with spaces").isEqualTo("    A  Test  ")
+    }
+
     @Test
     fun testColorize() {
         assertThat(colorize(ascii, Colors.REVERSE)).describedAs("colorize(reverse)").isEqualTo(
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
index aead144..0aea8d2 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
@@ -76,16 +76,16 @@ class Weather2Test : LocalProperties() {
     @Throws(ModuleException::class)
     fun testWeather() {
         var messages = getWeather("98204", getProperty(OWM_API_KEY_PROP))
-        assertThat(messages[0].msg).describedAs("is Everett").contains("Everett").contains("US")
+        assertThat(messages[0].msg).describedAs("is Everett").contains("Everett, United States").contains("US")
         assertThat(messages[messages.size - 1].msg).describedAs("is Everett zip code").endsWith("98204%2CUS")
 
         messages = getWeather("San Francisco", getProperty(OWM_API_KEY_PROP))
         assertThat(messages[0].msg).describedAs("is San Francisco").contains("San Francisco").contains("US")
         assertThat(messages[messages.size - 1].msg).describedAs("is San Fran city code").endsWith("5391959")
 
-        messages = getWeather("London, UK", getProperty(OWM_API_KEY_PROP))
-        assertThat(messages[0].msg).describedAs("is UK").contains("London").contains("UK")
-        assertThat(messages[messages.size - 1].msg).describedAs("is London city code").endsWith("4517009")
+        messages = getWeather("London, GB", getProperty(OWM_API_KEY_PROP))
+        assertThat(messages[0].msg).describedAs("is UK").contains("London, United Kingdom").contains("GB")
+        assertThat(messages[messages.size - 1].msg).describedAs("is London city code").endsWith("2643743")
 
         assertThatThrownBy { getWeather("Foo, US", getProperty(OWM_API_KEY_PROP)) }
             .describedAs("foo not found").hasCauseInstanceOf(APIException::class.java)

From abd34bde80b0e06593515d2e86632e8fe7338a1d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 31 Jul 2021 14:24:49 -0700
Subject: [PATCH 202/262] Added more countries.

---
 .../thauvin/erik/mobibot/modules/WorldTime.kt | 206 +++++++++++++++++-
 .../erik/mobibot/modules/WordTimeTest.kt      |  16 +-
 2 files changed, 211 insertions(+), 11 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index a9be03d..8244e15 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -50,10 +50,10 @@ import java.util.Locale
 class WorldTime(bot: Mobibot) : AbstractModule(bot) {
     companion object {
         // Beats (Internet Time) keyword
-        private const val BEATS_KEYWORD = ".beats"
+        const val BEATS_KEYWORD = ".beats"
 
         // Supported countries
-        private var COUNTRIES_MAP: Map<String, String>
+        var COUNTRIES_MAP: Map<String, String>
 
         // The Time command
         private const val TIME_CMD = "time"
@@ -95,85 +95,265 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         init {
             // Initialize the countries map
             val countries = mutableMapOf<String, String>()
+            countries["AD"] = "Europe/Andorra"
             countries["AE"] = "Asia/Dubai"
             countries["AF"] = "Asia/Kabul"
+            countries["AKDT"] = "America/Anchorage"
+            countries["AKST"] = "America/Anchorage"
             countries["AQ"] = "Antarctica/South_Pole"
+            countries["AR"] = "America/Argentina/Buenos_Aires"
+            countries["AS"] = "Pacific/Pago_Pago"
             countries["AT"] = "Europe/Vienna"
             countries["AU"] = "Australia/Sydney"
-            countries["AKST"] = "America/Anchorage"
-            countries["AKDT"] = "America/Anchorage"
+            countries["AX"] = "Europe/Mariehamn"
+            countries["AZ"] = "Asia/Baku"
+            countries["BA"] = "Europe/Sarajevo"
+            countries["BB"] = "America/Barbados"
+            countries["BD"] = "Asia/Dhaka"
             countries["BE"] = "Europe/Brussels"
+            countries["BEAT"] = BEATS_KEYWORD
+            countries["BF"] = "Africa/Ouagadougou"
+            countries["BG"] = "Europe/Sofia"
+            countries["BH"] = "Asia/Bahrain"
+            countries["BI"] = "Africa/Bujumbura"
+            countries["BJ"] = "Africa/Porto-Novo"
+            countries["BL"] = "America/St_Barthelemy"
+            countries["BM"] = "Atlantic/Bermuda"
+            countries["BMT"] = BEATS_KEYWORD
+            countries["BN"] = "Asia/Brunei"
+            countries["BQ"] = "America/Kralendijk"
             countries["BR"] = "America/Sao_Paulo"
+            countries["BS"] = "America/Toronto"
+            countries["BT"] = "Asia/Thimphu"
+            countries["BW"] = "Africa/Gaborone"
+            countries["BY"] = "Europe/Minsk"
+            countries["BZ"] = "America/Belize"
             countries["CA"] = "America/Montreal"
+            countries["CC"] = "Indian/Cocos"
+            countries["CD"] = "Africa/Kinshasa"
             countries["CDT"] = "America/Chicago"
             countries["CET"] = "CET"
+            countries["CF"] = "Africa/Bangui"
+            countries["CG"] = "Africa/Brazzaville"
             countries["CH"] = "Europe/Zurich"
+            countries["CI"] = "Africa/Abidjan"
+            countries["CK"] = "Pacific/Rarotonga"
+            countries["CL"] = "America/Santiago"
             countries["CN"] = "Asia/Shanghai"
+            countries["CO"] = "America/Bogota"
+            countries["CR"] = "America/Costa_Rica"
             countries["CST"] = "America/Chicago"
             countries["CU"] = "Cuba"
+            countries["CV"] = "Atlantic/Cape_Verde"
+            countries["CW"] = "America/Curacao"
+            countries["CX"] = "Indian/Christmas"
+            countries["CY"] = "Asia/Nicosia"
+            countries["CZ"] = "Europe/Prague"
             countries["DE"] = "Europe/Berlin"
+            countries["DJ"] = "Africa/Djibouti"
             countries["DK"] = "Europe/Copenhagen"
+            countries["DM"] = "America/Dominica"
+            countries["DO"] = "America/Santo_Domingo"
+            countries["DZ"] = "Africa/Algiers"
+            countries["EC"] = "Pacific/Galapagos"
             countries["EDT"] = "America/New_York"
+            countries["EE"] = "Europe/Tallinn"
             countries["EG"] = "Africa/Cairo"
+            countries["EH"] = "Africa/El_Aaiun"
             countries["ER"] = "Africa/Asmara"
             countries["ES"] = "Europe/Madrid"
             countries["EST"] = "America/New_York"
+            countries["ET"] = "Africa/Addis_Ababa"
             countries["FI"] = "Europe/Helsinki"
+            countries["FJ"] = "Pacific/Fiji"
+            countries["FK"] = "Atlantic/Stanley"
+            countries["FM"] = "Pacific/Port_Moresby"
+            countries["FO"] = "Atlantic/Faroe"
             countries["FR"] = "Europe/Paris"
+            countries["GA"] = "Asia/Tbilisi"
             countries["GB"] = "Europe/London"
+            countries["GD"] = "America/Grenada"
+            countries["GE"] = "Asia/Tbilisi"
+            countries["GF"] = "America/Cayenne"
+            countries["GG"] = "Europe/London"
+            countries["GH"] = "Africa/Accra"
+            countries["GI"] = "Europe/Gibraltar"
+            countries["GL"] = "America/Thule"
+            countries["GM"] = "Africa/Banjul"
             countries["GMT"] = "GMT"
+            countries["GN"] = "Africa/Conakry"
+            countries["GP"] = "America/Guadeloupe"
+            countries["GQ"] = "Africa/Malabo"
             countries["GR"] = "Europe/Athens"
+            countries["GS"] = "Atlantic/South_Georgia"
+            countries["GT"] = "America/Guatemala"
+            countries["GU"] = "Pacific/Guam"
+            countries["GW"] = "Africa/Bissau"
+            countries["GY"] = "America/Guyana"
             countries["HK"] = "Asia/Hong_Kong"
+            countries["HN"] = "America/Tegucigalpa"
+            countries["HR"] = "Europe/Zagreb"
             countries["HST"] = "Pacific/Honolulu"
+            countries["HT"] = "America/Port-au-Prince"
+            countries["HU"] = "Europe/Budapest"
+            countries["ID"] = "Asia/Jakarta"
             countries["IE"] = "Europe/Dublin"
             countries["IL"] = "Asia/Tel_Aviv"
+            countries["IM"] = "Europe/London"
             countries["IN"] = "Asia/Kolkata"
             countries["IQ"] = "Asia/Baghdad"
             countries["IR"] = "Asia/Tehran"
             countries["IS"] = "Atlantic/Reykjavik"
             countries["IT"] = "Europe/Rome"
+            countries["JE"] = "Europe/London"
             countries["JM"] = "Jamaica"
+            countries["JO"] = "Asia/Amman"
             countries["JP"] = "Asia/Tokyo"
+            countries["KE"] = "Africa/Nairobi"
+            countries["KG"] = "Asia/Bishkek"
+            countries["KH"] = "Asia/Phnom_Penh"
+            countries["KI"] = "Pacific/Tarawa"
+            countries["KM"] = "Indian/Comoro"
+            countries["KN"] = "America/St_Kitts"
+            countries["KP"] = "Asia/Pyongyang"
+            countries["KR"] = "Asia/Seoul"
+            countries["KW"] = "Asia/Riyadh"
+            countries["KY"] = "America/Cayman"
+            countries["KZ"] = "Asia/Oral"
+            countries["LA"] = "Asia/Vientiane"
+            countries["LB"] = "Asia/Beirut"
+            countries["LC"] = "America/St_Lucia"
+            countries["LI"] = "Europe/Vaduz"
+            countries["LK"] = "Asia/Colombo"
+            countries["LR"] = "Africa/Monrovia"
+            countries["LS"] = "Africa/Maseru"
+            countries["LT"] = "Europe/Vilnius"
+            countries["LU"] = "Europe/Luxembourg"
+            countries["LV"] = "Europe/Riga"
             countries["LY"] = "Africa/Tripoli"
             countries["MA"] = "Africa/Casablanca"
+            countries["MC"] = "Europe/Monaco"
+            countries["MD"] = "Europe/Chisinau"
             countries["MDT"] = "America/Denver"
+            countries["ME"] = "Europe/Podgorica"
+            countries["MF"] = "America/Marigot"
+            countries["MG"] = "Indian/Antananarivo"
             countries["MH"] = "Kwajalein"
+            countries["MK"] = "Europe/Skopje"
+            countries["ML"] = "Africa/Bamako"
+            countries["MM"] = "Asia/Yangon"
+            countries["MN"] = "Asia/Ulaanbaatar"
+            countries["MO"] = "Asia/Macau"
+            countries["MP"] = "Pacific/Saipan"
             countries["MQ"] = "America/Martinique"
+            countries["MR"] = "Africa/Nouakchott"
+            countries["MS"] = "America/Montserrat"
             countries["MST"] = "America/Denver"
+            countries["MT"] = "Europe/Malta"
+            countries["MU"] = "Indian/Mauritius"
+            countries["MV"] = "Indian/Maldives"
+            countries["MW"] = "Africa/Blantyre"
             countries["MX"] = "America/Mexico_City"
+            countries["MY"] = "Asia/Kuala_Lumpur"
+            countries["MZ"] = "Africa/Maputo"
+            countries["NA"] = "Africa/Windhoek"
+            countries["NC"] = "Pacific/Noumea"
+            countries["NE"] = "Africa/Niamey"
+            countries["NF"] = "Pacific/Norfolk"
+            countries["NG"] = "Africa/Lagos"
+            countries["NI"] = "America/Managua"
             countries["NL"] = "Europe/Amsterdam"
             countries["NO"] = "Europe/Oslo"
             countries["NP"] = "Asia/Kathmandu"
+            countries["NR"] = "Pacific/Nauru"
+            countries["NU"] = "Pacific/Niue"
             countries["NZ"] = "Pacific/Auckland"
+            countries["OM"] = "Asia/Muscat"
+            countries["PA"] = "America/Panama"
             countries["PDT"] = "America/Los_Angeles"
+            countries["PE"] = "America/Lima"
+            countries["PF"] = "Pacific/Tahiti"
+            countries["PG"] = "Pacific/Pohnpei"
             countries["PH"] = "Asia/Manila"
             countries["PK"] = "Asia/Karachi"
             countries["PL"] = "Europe/Warsaw"
+            countries["PM"] = "America/Miquelon"
+            countries["PN"] = "Pacific/Pitcairn"
+            countries["PR"] = "America/Puerto_Rico"
+            countries["PS"] = "Asia/Gaza"
             countries["PST"] = "America/Los_Angeles"
             countries["PT"] = "Europe/Lisbon"
-            countries["PR"] = "America/Puerto_Rico"
+            countries["PW"] = "Pacific/Palau"
+            countries["PY"] = "America/Asuncion"
+            countries["QA"] = "Asia/Qatar"
+            countries["RE"] = "Indian/Reunion"
+            countries["RO"] = "Europe/Bucharest"
+            countries["RS"] = "Europe/Belgrade"
             countries["RU"] = "Europe/Moscow"
+            countries["RW"] = "Africa/Kigali"
+            countries["SA"] = "Africa/Johannesburg"
+            countries["SB"] = "Pacific/Guadalcanal"
+            countries["SC"] = "Indian/Mahe"
+            countries["SD"] = "Africa/Khartoum"
             countries["SE"] = "Europe/Stockholm"
             countries["SG"] = "Asia/Singapore"
+            countries["SH"] = "Atlantic/St_Helena"
+            countries["SI"] = "Europe/Ljubljana"
+            countries["SJ"] = "Atlantic/Jan_Mayen"
+            countries["SK"] = "Europe/Bratislava"
+            countries["SL"] = "Africa/Freetown"
+            countries["SM"] = "Europe/San_Marino"
+            countries["SN"] = "Africa/Dakar"
+            countries["SO"] = "Africa/Mogadishu"
+            countries["SR"] = "America/Paramaribo"
+            countries["SS"] = "Africa/Juba"
+            countries["ST"] = "Africa/Sao_Tome"
+            countries["SV"] = "America/El_Salvador"
+            countries["SX"] = "America/Marigot"
+            countries["SY"] = "Asia/Damascus"
+            countries["SZ"] = "Africa/Mbabane"
+            countries["TC"] = "America/Grand_Turk"
+            countries["TD"] = "Africa/Ndjamena"
+            countries["TF"] = "Indian/Kerguelen"
+            countries["TG"] = "Africa/Lome"
             countries["TH"] = "Asia/Bangkok"
+            countries["TJ"] = "Asia/Dushanbe"
+            countries["TK"] = "Pacific/Fakaofo"
+            countries["TL"] = "Asia/Dili"
             countries["TM"] = "Asia/Ashgabat"
             countries["TN"] = "Africa/Tunis"
+            countries["TO"] = "Pacific/Tongatapu"
             countries["TR"] = "Europe/Istanbul"
+            countries["TT"] = "America/Port_of_Spain"
+            countries["TV"] = "Pacific/Funafuti"
             countries["TW"] = "Asia/Taipei"
+            countries["TZ"] = "Africa/Dar_es_Salaam"
+            countries["UA"] = "Europe/Kiev"
+            countries["UG"] = "Africa/Kampala"
             countries["UK"] = "Europe/London"
+            countries["UM"] = "Pacific/Johnston"
             countries["US"] = "America/New_York"
             countries["UTC"] = "UTC"
+            countries["UY"] = "America/Montevideo"
+            countries["UZ"] = "Asia/Tashkent"
             countries["VA"] = "Europe/Vatican"
+            countries["VC"] = "America/St_Vincent"
             countries["VE"] = "America/Caracas"
+            countries["VG"] = "America/Tortola"
+            countries["VI"] = "America/St_Johns"
             countries["VN"] = "Asia/Ho_Chi_Minh"
+            countries["VU"] = "Pacific/Efate"
+            countries["WF"] = "Pacific/Wallis"
+            countries["WS"] = "Pacific/Apia"
+            countries["YE"] = "Asia/Aden"
+            countries["YT"] = "Indian/Mayotte"
             countries["ZA"] = "Africa/Johannesburg"
+            countries["ZM"] = "Africa/Lusaka"
             countries["ZULU"] = "Zulu"
-            countries["INTERNET"] = BEATS_KEYWORD
-            countries["BEATS"] = BEATS_KEYWORD
             @Suppress("MagicNumber")
             ZoneId.getAvailableZoneIds().stream()
                 .filter { tz: String ->
-                    !tz.contains("/") && tz.length == 3 && !countries.containsKey(tz)
+                    tz.length <= 3 && !countries.containsKey(tz)
                 }
                 .forEach { tz: String ->
                     countries[tz] = tz
@@ -192,7 +372,13 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             if (args.isEmpty()) {
                 send(sender, "The supported countries/zones are: ", isPrivate)
                 @Suppress("MagicNumber")
-                sendList(sender, ArrayList(COUNTRIES_MAP.keys), 17, isPrivate = false)
+                sendList(
+                    sender,
+                    COUNTRIES_MAP.keys.sorted().stream().map { it.padEnd(4) }.toList(),
+                    14,
+                    isPrivate = false,
+                    isIndent = true
+                )
             } else {
                 val msg = time(args)
                 if (isPrivate) {
@@ -213,7 +399,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
     init {
         with(help) {
             add("To display a country's current date/time:")
-            add(helpFormat("%c $TIME_CMD [<country code>]"))
+            add(helpFormat("%c $TIME_CMD <country code>"))
             add("For a listing of the supported countries:")
             add(helpFormat("%c $TIME_CMD"))
         }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index 73a2007..fa5dd90 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -32,9 +32,13 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.modules.WorldTime.Companion.BEATS_KEYWORD
+import net.thauvin.erik.mobibot.modules.WorldTime.Companion.COUNTRIES_MAP
 import net.thauvin.erik.mobibot.modules.WorldTime.Companion.time
 import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
+import java.time.ZoneId
+import java.time.zone.ZoneRulesException
 
 /**
  * The `WordTimeTest` class.
@@ -44,6 +48,16 @@ class WordTimeTest {
     fun testTime() {
         assertThat(time("PST").msg).describedAs("PST").endsWith(bold("Los Angeles"))
         assertThat(time("BLAH").isError).describedAs("BLAH").isTrue
-        assertThat(time("BEATS").msg).describedAs("BEATS").contains("@")
+        assertThat(time("BEAT").msg).describedAs(BEATS_KEYWORD).endsWith(BEATS_KEYWORD).contains("@")
+    }
+
+    @Test
+    @Throws(ZoneRulesException::class)
+    fun testCountries() {
+        COUNTRIES_MAP.toSortedMap().forEach {
+            if (it.value != BEATS_KEYWORD) {
+                ZoneId.of(it.value)
+            }
+        }
     }
 }

From ef6c600dbcdff2f7ffca38cec7f613fd7f2ecb98 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 1 Aug 2021 00:52:20 -0700
Subject: [PATCH 203/262] Added dice & cards emoji/unicode to games.

---
 config/detekt/baseline.xml                    |  1 +
 .../net/thauvin/erik/mobibot/modules/War.java | 26 +++++++++++--------
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  |  4 +--
 .../net/thauvin/erik/mobibot/modules/Dice.kt  | 19 +++++++-------
 .../erik/mobibot/modules/RockPaperScissors.kt | 19 ++++++++------
 5 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 0b6f182..b92e51b 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -15,6 +15,7 @@
     <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
     <ID>NestedBlockDepth:Addons.kt$Addons$ fun add(command: AbstractCommand, props: Properties)</ID>
+    <ID>NestedBlockDepth:Calc.kt$Calc$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
     <ID>NestedBlockDepth:Comment.kt$Comment$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
     <ID>NestedBlockDepth:CryptoPrices.kt$CryptoPrices$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
     <ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 1f86130..2e83533 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -51,11 +51,17 @@ public final class War extends AbstractModule {
     private static final SecureRandom RANDOM = new SecureRandom();
     // War command
     private static final String WAR_CMD = "war";
-    // Deck of card
-    private static final String[] WAR_DECK =
-            {"Ace", "King", "Queen", "Jack", "10", "9", "8", "7", "6", "5", "4", "3", "2"};
-    // Suits for the deck of card
-    private static final String[] WAR_SUITS = {"Hearts", "Spades", "Diamonds", "Clubs"};
+
+    private static final String[] HEARTS =
+            {"🂱", "🂾", "🂽", "🂼", "🂻", "🂺", "🂹", "🂸", "🂷", "🂶", "🂵", "🂴", "🂳", "🂲"};
+    private static final String[] SPADES =
+            {"🂡", "🂮", "🂭", "🂬", "🂫", "🂪", "🂩", "🂨", "🂧", "🂦", "🂥", "🂤", "🂣", "🂢"};
+    private static final String[] DIAMONDS =
+            {"🃁", "🃎", "🃍", "🃌", "🃋", "🃊", "🃉", "🃈", "🃇", "🃆", "🃅", "🃄", "🃃", "🃂"};
+    private static final String[] CLUBS =
+            {"🃑", "🃞", "🃝", "🃜", "🃛", "🃚", "🃙", "🃘", "🃗", "🃖", "🃕", "🃔", "🃓", "🃒"};
+
+    private static final String[][] DECK = {HEARTS, SPADES, DIAMONDS, CLUBS};
 
     /**
      * The default constructor.
@@ -81,13 +87,11 @@ public final class War extends AbstractModule {
         int y;
 
         while (true) {
-            i = RANDOM.nextInt(WAR_DECK.length);
-            y = RANDOM.nextInt(WAR_DECK.length);
+            i = RANDOM.nextInt(HEARTS.length);
+            y = RANDOM.nextInt(HEARTS.length);
 
-            getBot().send(sender + " drew the " + bold(WAR_DECK[i]) + " of "
-                    + bold(WAR_SUITS[RANDOM.nextInt(WAR_SUITS.length)]));
-            getBot().action("drew the " + bold(WAR_DECK[y]) + " of "
-                    + bold(WAR_SUITS[RANDOM.nextInt(WAR_SUITS.length)]));
+            getBot().send(sender + " drew: " + DECK[RANDOM.nextInt(DECK.length)][i]);
+            getBot().action("drew: " + DECK[RANDOM.nextInt(DECK.length)][y]);
 
             if (i != y) {
                 break;
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 986230a..a16c01b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -99,12 +99,12 @@ object Utils {
      * Capitalize a string.
      */
     @JvmStatic
-    fun String.capitalise(): String = this.replaceFirstChar { it.uppercase() }
+    fun String.capitalise(): String = this.lowercase().replaceFirstChar { it.uppercase() }
 
     /**
      * Capitalize words
      */
-    fun String.capitalizeWords(): String = split(" ").map { it.lowercase().capitalise() }.joinToString(" ")
+    fun String.capitalizeWords(): String = split(" ").joinToString(" ") { it.capitalise() }
 
 
     /**
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index ec3a0e6..57e78ca 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -32,7 +32,6 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import kotlin.random.Random
 
@@ -46,22 +45,20 @@ class Dice(bot: Mobibot) : AbstractModule(bot) {
         args: String,
         isPrivate: Boolean
     ) {
+        val botRoll = roll()
         val roll = roll()
-        val playerRoll = roll()
+        val botTotal = botRoll.first + botRoll.second
         val total = roll.first + roll.second
-        val playerTotal = playerRoll.first + playerRoll.second
         with(bot) {
             send(
                 channel,
-                "$sender rolled two dice: ${bold(playerRoll.first)} and ${bold(playerRoll.second)}"
-                        + " for a total of ${bold(playerTotal)}",
+                "$sender rolled ${total}: ${DICE_FACES[roll.first]}  ${DICE_FACES[roll.second]}",
                 isPrivate
             )
             action(
-                "rolled two dice: ${bold(roll.first)} and ${bold(roll.second)}" +
-                        " for a total of ${bold(total)}"
+                "rolled ${botTotal}: ${DICE_FACES[botRoll.first]}  ${DICE_FACES[botRoll.second]}"
             )
-            when (winLoseOrTie(total, playerTotal)) {
+            when (winLoseOrTie(botTotal, total)) {
                 Result.WIN -> action("wins.")
                 Result.LOSE -> action("lost.")
                 else -> action("tied.")
@@ -74,14 +71,16 @@ class Dice(bot: Mobibot) : AbstractModule(bot) {
     }
 
     private fun roll(): Pair<Int, Int> {
-        @Suppress("MagicNumber")
-        return Random.nextInt(1, 7) to Random.nextInt(1, 7)
+        return Random.nextInt(1, DICE_FACES.size) to Random.nextInt(1, DICE_FACES.size)
     }
 
     companion object {
         // Dice command
         private const val DICE_CMD = "dice"
 
+        // Dice faces
+        private val DICE_FACES = arrayOf("", "⚀", "⚁", "⚂", "⚃", "⚄", "⚅")
+
         fun winLoseOrTie(bot: Int, player: Int): Result {
             return when {
                 bot > player -> {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index bfcbe23..33b1fce 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -33,10 +33,8 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.bold
-import net.thauvin.erik.mobibot.Utils.green
+import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.Utils.red
 import kotlin.random.Random
 
 
@@ -67,19 +65,26 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
             override fun beats(hand: Hands): Boolean {
                 return hand == SCISSORS
             }
+
+            override var emoji = "\u270A"
         },
         PAPER("covers") {
             override fun beats(hand: Hands): Boolean {
                 return hand == ROCK
             }
+
+            override var emoji = "\u270B"
         },
         SCISSORS("cuts") {
             override fun beats(hand: Hands): Boolean {
                 return hand == PAPER
             }
+
+            override var emoji = "\u270C"
         };
 
         abstract fun beats(hand: Hands): Boolean
+        abstract var emoji: String
     }
 
     companion object {
@@ -100,18 +105,16 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
         val hand = Hands.valueOf(cmd.uppercase())
         val botHand = Hands.values()[Random.nextInt(0, Hands.values().size)]
         with(bot) {
+            send("${hand.emoji}  vs. ${botHand.emoji}")
             when {
                 hand == botHand -> {
-                    send("${green(hand.name)} vs. ${green(botHand.name)}")
                     action("tied.")
                 }
                 hand.beats(botHand) -> {
-                    send("${green(hand.name)} ${bold(hand.action)} ${red(botHand.name)}")
-                    action("lost.")
+                    action("lost. ${hand.name.capitalise()} ${hand.action} ${botHand.name.lowercase()}.")
                 }
                 else -> {
-                    send("${green(botHand.name)} ${bold(botHand.action)} ${red(hand.name)}")
-                    action("wins.")
+                    action("wins. ${botHand.name.capitalise()} ${botHand.action} ${hand.name.lowercase()}.")
                 }
             }
         }

From 2784af626b6db01646dc8e7112ec14d135687b86 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 1 Aug 2021 14:36:25 -0700
Subject: [PATCH 204/262] Added more zones.

---
 .../thauvin/erik/mobibot/modules/WorldTime.kt | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 8244e15..ee728e7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -84,7 +84,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
                     "The current Internet Time is: ${bold(internetTime())} $BEATS_KEYWORD"
                 } else {
                     (ZonedDateTime.now().withZoneSameInstant(ZoneId.of(tz)).format(dtf)
-                            + bold(tz.substring(tz.indexOf('/') + 1).replace('_', ' ')))
+                            + bold(tz.substring(tz.lastIndexOf('/') + 1).replace('_', ' ')))
                 }
             } else {
                 return ErrorMessage("Unsupported country/zone. Please try again.")
@@ -98,13 +98,19 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["AD"] = "Europe/Andorra"
             countries["AE"] = "Asia/Dubai"
             countries["AF"] = "Asia/Kabul"
+            countries["AG"] = "America/Antigua"
+            countries["AI"] = "America/Anguilla"
             countries["AKDT"] = "America/Anchorage"
             countries["AKST"] = "America/Anchorage"
+            countries["AL"] = "Europe/Tirane"
+            countries["AM"] = "Asia/Yerevan"
+            countries["AO"] = "Africa/Luanda"
             countries["AQ"] = "Antarctica/South_Pole"
             countries["AR"] = "America/Argentina/Buenos_Aires"
             countries["AS"] = "Pacific/Pago_Pago"
             countries["AT"] = "Europe/Vienna"
             countries["AU"] = "Australia/Sydney"
+            countries["AW"] = "America/Aruba"
             countries["AX"] = "Europe/Mariehamn"
             countries["AZ"] = "Asia/Baku"
             countries["BA"] = "Europe/Sarajevo"
@@ -121,9 +127,10 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["BM"] = "Atlantic/Bermuda"
             countries["BMT"] = BEATS_KEYWORD
             countries["BN"] = "Asia/Brunei"
+            countries["BO"] = "America/La_Paz"
             countries["BQ"] = "America/Kralendijk"
             countries["BR"] = "America/Sao_Paulo"
-            countries["BS"] = "America/Toronto"
+            countries["BS"] = "America/Nassau"
             countries["BT"] = "Asia/Thimphu"
             countries["BW"] = "Africa/Gaborone"
             countries["BY"] = "Europe/Minsk"
@@ -139,6 +146,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["CI"] = "Africa/Abidjan"
             countries["CK"] = "Pacific/Rarotonga"
             countries["CL"] = "America/Santiago"
+            countries["CM"] = "Africa/Douala"
             countries["CN"] = "Asia/Shanghai"
             countries["CO"] = "America/Bogota"
             countries["CR"] = "America/Costa_Rica"
@@ -167,15 +175,15 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["FI"] = "Europe/Helsinki"
             countries["FJ"] = "Pacific/Fiji"
             countries["FK"] = "Atlantic/Stanley"
-            countries["FM"] = "Pacific/Port_Moresby"
+            countries["FM"] = "Pacific/Yap"
             countries["FO"] = "Atlantic/Faroe"
             countries["FR"] = "Europe/Paris"
-            countries["GA"] = "Asia/Tbilisi"
+            countries["GA"] = "Africa/Libreville"
             countries["GB"] = "Europe/London"
             countries["GD"] = "America/Grenada"
             countries["GE"] = "Asia/Tbilisi"
             countries["GF"] = "America/Cayenne"
-            countries["GG"] = "Europe/London"
+            countries["GG"] = "Europe/Guernsey"
             countries["GH"] = "Africa/Accra"
             countries["GI"] = "Europe/Gibraltar"
             countries["GL"] = "America/Thule"
@@ -199,13 +207,14 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["ID"] = "Asia/Jakarta"
             countries["IE"] = "Europe/Dublin"
             countries["IL"] = "Asia/Tel_Aviv"
-            countries["IM"] = "Europe/London"
+            countries["IM"] = "Europe/Isle_of_Man"
             countries["IN"] = "Asia/Kolkata"
+            countries["IO"] = "Indian/Chagos"
             countries["IQ"] = "Asia/Baghdad"
             countries["IR"] = "Asia/Tehran"
             countries["IS"] = "Atlantic/Reykjavik"
             countries["IT"] = "Europe/Rome"
-            countries["JE"] = "Europe/London"
+            countries["JE"] = "Europe/Jersey"
             countries["JM"] = "Jamaica"
             countries["JO"] = "Asia/Amman"
             countries["JP"] = "Asia/Tokyo"
@@ -238,9 +247,9 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["ME"] = "Europe/Podgorica"
             countries["MF"] = "America/Marigot"
             countries["MG"] = "Indian/Antananarivo"
-            countries["MH"] = "Kwajalein"
+            countries["MH"] = "Pacific/Majuro"
             countries["MK"] = "Europe/Skopje"
-            countries["ML"] = "Africa/Bamako"
+            countries["ML"] = "Africa/Timbuktu"
             countries["MM"] = "Asia/Yangon"
             countries["MN"] = "Asia/Ulaanbaatar"
             countries["MO"] = "Asia/Macau"
@@ -273,7 +282,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["PDT"] = "America/Los_Angeles"
             countries["PE"] = "America/Lima"
             countries["PF"] = "Pacific/Tahiti"
-            countries["PG"] = "Pacific/Pohnpei"
+            countries["PG"] = "Pacific/Port_Moresby"
             countries["PH"] = "Asia/Manila"
             countries["PK"] = "Asia/Karachi"
             countries["PL"] = "Europe/Warsaw"
@@ -291,7 +300,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["RS"] = "Europe/Belgrade"
             countries["RU"] = "Europe/Moscow"
             countries["RW"] = "Africa/Kigali"
-            countries["SA"] = "Africa/Johannesburg"
+            countries["SA"] = "Asia/Riyadh"
             countries["SB"] = "Pacific/Guadalcanal"
             countries["SC"] = "Indian/Mahe"
             countries["SD"] = "Africa/Khartoum"
@@ -309,7 +318,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["SS"] = "Africa/Juba"
             countries["ST"] = "Africa/Sao_Tome"
             countries["SV"] = "America/El_Salvador"
-            countries["SX"] = "America/Marigot"
+            countries["SX"] = "America/Lower_Princes"
             countries["SY"] = "Asia/Damascus"
             countries["SZ"] = "Africa/Mbabane"
             countries["TC"] = "America/Grand_Turk"
@@ -331,7 +340,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["UA"] = "Europe/Kiev"
             countries["UG"] = "Africa/Kampala"
             countries["UK"] = "Europe/London"
-            countries["UM"] = "Pacific/Johnston"
+            countries["UM"] = "Pacific/Wake"
             countries["US"] = "America/New_York"
             countries["UTC"] = "UTC"
             countries["UY"] = "America/Montevideo"
@@ -340,7 +349,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["VC"] = "America/St_Vincent"
             countries["VE"] = "America/Caracas"
             countries["VG"] = "America/Tortola"
-            countries["VI"] = "America/St_Johns"
+            countries["VI"] = "America/St_Thomas"
             countries["VN"] = "Asia/Ho_Chi_Minh"
             countries["VU"] = "Pacific/Efate"
             countries["WF"] = "Pacific/Wallis"
@@ -350,6 +359,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
             countries["ZA"] = "Africa/Johannesburg"
             countries["ZM"] = "Africa/Lusaka"
             countries["ZULU"] = "Zulu"
+            countries["ZW"] = "Africa/Harare"
             @Suppress("MagicNumber")
             ZoneId.getAvailableZoneIds().stream()
                 .filter { tz: String ->

From d11f32189e85b731441db4d5c985a423d9a31157 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 1 Aug 2021 23:23:14 -0700
Subject: [PATCH 205/262] Added separator parameter to sendList() function.

---
 .../kotlin/net/thauvin/erik/mobibot/Mobibot.kt   |  7 ++++---
 .../net/thauvin/erik/mobibot/commands/AddLog.kt  |  2 +-
 .../net/thauvin/erik/mobibot/commands/Ignore.kt  |  2 +-
 .../net/thauvin/erik/mobibot/commands/Info.kt    |  2 +-
 .../net/thauvin/erik/mobibot/commands/Modules.kt |  2 +-
 .../net/thauvin/erik/mobibot/commands/Users.kt   |  2 +-
 .../thauvin/erik/mobibot/commands/Versions.kt    |  2 +-
 .../thauvin/erik/mobibot/PinboardUtilsTest.kt    | 16 ++++++++--------
 8 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index c532b4b..6e21c00 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -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
                 ),
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
index c0c0275..f13aa4d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
@@ -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)
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
index 537b19c..7ae45a2 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -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)
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
index 7d2fc84..230539f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
@@ -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))
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
index 2bd43c9..3bd2db1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -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)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
index de83bdf..82f5277 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
@@ -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)
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
index 72acc6b..1712add 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
@@ -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)
         }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index d9c7354..dbaf270 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -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

From c7961c281709b44770473e686e3df4799a2a316d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 1 Aug 2021 23:23:44 -0700
Subject: [PATCH 206/262] Added currency formatting.

---
 .../erik/mobibot/modules/CurrencyConverter.kt | 25 +++++++++++--------
 .../mobibot/modules/CurrencyConverterTest.kt  |  9 ++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index ecf214d..e0b7088 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -31,7 +31,6 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
@@ -45,10 +44,12 @@ import org.jdom2.input.SAXBuilder
 import java.io.IOException
 import java.net.URL
 import java.text.NumberFormat
+import java.util.Currency
+import java.util.Locale
 import javax.xml.XMLConstants
 
 /**
- * The CurrentConverter module.
+ * The CurrencyConverter module.
  */
 class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
     override fun commandResponse(
@@ -87,9 +88,9 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                     helpResponse(sender, isPrivate)
                 }
             } else if (args.contains(CURRENCY_RATES_KEYWORD)) {
-                send(sender, "The currency rates for ${bold(pubDate)} are:", isPrivate)
+                send(sender, "The reference rates for ${bold(pubDate)} are:", isPrivate)
                 @Suppress("MagicNumber")
-                sendList(sender, currencyRates(), 3, isPrivate, isIndent = true)
+                sendList(sender, currencyRates(), 3, "   ", isPrivate, isIndent = true)
             } else {
                 helpResponse(sender, isPrivate)
             }
@@ -116,7 +117,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                     ),
                     isPrivate
                 )
-                send(sender, "For a listing of current rates:", isPrivate)
+                send(sender, "For a listing of current reference rates:", isPrivate)
                 send(
                     sender,
                     helpFormat(
@@ -126,7 +127,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                 )
                 send(sender, "The supported currencies are: ", isPrivate)
                 @Suppress("MagicNumber")
-                sendList(sender, ArrayList(EXCHANGE_RATES.keys), 11, isPrivate, isIndent = true)
+                sendList(sender, ArrayList(EXCHANGE_RATES.keys), 11, isPrivate = isPrivate, isIndent = true)
             }
         }
         return true
@@ -151,8 +152,11 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         // Last exchange rates table publication date
         private var pubDate = ""
 
-        private fun Double.formatCurrency(): String =
-            NumberFormat.getCurrencyInstance(Constants.LOCALE).format(this).substring(1)
+        private fun Double.formatCurrency(currency: String): String =
+            NumberFormat.getCurrencyInstance(Locale.getDefault(Locale.Category.FORMAT)).let {
+                it.currency = Currency.getInstance(currency)
+                it.format(this)
+            }
 
         /**
          * Converts from a currency to another.
@@ -173,8 +177,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
                             val doubleFrom = EXCHANGE_RATES[to]!!.toDouble()
                             val doubleTo = EXCHANGE_RATES[from]!!.toDouble()
                             PublicMessage(
-                                amt.formatCurrency() + " ${cmds[1].uppercase()} = "
-                                        + (amt * doubleTo / doubleFrom).formatCurrency() + " ${cmds[3].uppercase()}"
+                                amt.formatCurrency(to) + " = " + (amt * doubleTo / doubleFrom).formatCurrency(from)
                             )
                         } catch (e: NumberFormatException) {
                             ErrorMessage("Let's try with some real numbers next time, okay?")
@@ -192,7 +195,7 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
             val rates = mutableListOf<String>()
             for ((key, value) in EXCHANGE_RATES.toSortedMap()) {
                 @Suppress("MagicNumber")
-                rates.add("  $key: ${value.padStart(8)}")
+                rates.add("$key: ${value.padStart(8)}")
             }
             return rates
         }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
index 5d509d3..88515cc 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
@@ -51,11 +51,14 @@ class CurrencyConverterTest {
     @Test
     fun testConvertCurrency() {
         assertThat(convertCurrency("100 USD to EUR").msg)
-            .describedAs("100 USD to EUR").matches("100\\.00 USD = \\d{2,3}\\.\\d{2} EUR")
+            .describedAs("100 USD to EUR").matches("\\$100\\.00 = €\\d{2,3}\\.\\d{2}")
         assertThat(convertCurrency("100 USD to USD").msg).describedAs("100 USD to USD")
             .contains("You're kidding, right?")
         assertThat(convertCurrency("100 USD").msg).describedAs("100 USD").contains("Invalid query.")
-        assertThat(currencyRates().size).describedAs("currencyRates().size() == 33").isEqualTo(33)
-        assertThat(currencyRates()).describedAs("currencyRates().get(EUR)").contains("  EUR:        1")
+        val rates = currencyRates()
+        assertThat(rates.size).describedAs("currencyRates.size == 33").isEqualTo(33)
+        assertThat(rates).describedAs("currencyRates(EUR)").contains("EUR:        1")
+        assertThat(rates.stream().anyMatch { it.matches("USD: .*".toRegex()) })
+            .describedAs("currencyRates(USD)").isTrue
     }
 }

From d130957c6f2b111fa00b5cd068692f981f0ec259 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 24 Aug 2021 18:56:33 -0700
Subject: [PATCH 207/262] Dependencies updates. Kotlin 1.5.30.

---
 build.gradle                                  |  26 +-
 config/detekt/baseline.xml                    |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       | 269 +++++++++++-------
 .../net/thauvin/erik/mobibot/modules/Calc.kt  |  18 +-
 version.properties                            |   6 +-
 6 files changed, 196 insertions(+), 127 deletions(-)

diff --git a/build.gradle b/build.gradle
index ccdd746..fdee3ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,12 @@ plugins {
     id 'application'
     id 'com.github.ben-manes.versions' version '0.39.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.18.0-RC2'
+    id 'io.gitlab.arturbosch.detekt' version '1.18.0'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.21'
-    id 'org.jetbrains.kotlin.kapt' version '1.5.21'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.30'
+    id 'org.jetbrains.kotlin.kapt' version '1.5.30'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -56,7 +56,7 @@ dependencies {
     implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
 
     implementation 'org.json:json:20210307'
-    implementation 'org.jsoup:jsoup:1.14.1'
+    implementation 'org.jsoup:jsoup:1.14.2'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
     testImplementation 'org.assertj:assertj-core:3.20.2'
@@ -78,6 +78,24 @@ java {
     targetCompatibility = JavaVersion.VERSION_11
 }
 
+kotlin {
+    // Add kapt.use.worker.api=false to gradle.properties (JDK 16+)
+    // See: https://youtrack.jetbrains.com/issue/KT-45545
+    kotlinDaemonJvmArgs = [
+            "-Dfile.encoding=UTF-8",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
+    ]
+}
+
 kapt {
     arguments {
         arg('semver.project.dir', projectDir)
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index b92e51b..c3f468f 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -12,7 +12,7 @@
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
     <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
-    <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
+    <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, separator: String = " ", isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
     <ID>NestedBlockDepth:Addons.kt$Addons$ fun add(command: AbstractCommand, props: Properties)</ID>
     <ID>NestedBlockDepth:Calc.kt$Calc$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 05679dc..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 744e882..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
index 11602e6..6202fdf 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -49,14 +49,16 @@ class Calc(bot: Mobibot) : AbstractModule(bot) {
         isPrivate: Boolean
     ) {
         if (args.isNotBlank()) {
-            try {
-                bot.send(calculate(args))
-            } catch (e: IllegalArgumentException) {
-                if (bot.logger.isWarnEnabled) bot.logger.warn("Failed to calculate: $args", e)
-                bot.send("No idea. This is the kind of math I don't get.")
-            } catch (e: UnknownFunctionOrVariableException) {
-                if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to calculate: $args", e)
-                bot.send("No idea. I must've some form of Dyscalculia.")
+            with (bot) {
+                try {
+                    send(calculate(args))
+                } catch (e: IllegalArgumentException) {
+                    if (logger.isWarnEnabled) logger.warn("Failed to calculate: $args", e)
+                    send("No idea. This is the kind of math I don't get.")
+                } catch (e: UnknownFunctionOrVariableException) {
+                    if (logger.isWarnEnabled) logger.warn("Unable to calculate: $args", e)
+                    send("No idea. I must've some form of Dyscalculia.")
+                }
             }
         } else {
             helpResponse(sender, isPrivate)
diff --git a/version.properties b/version.properties
index 3ad6de0..50f350f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Jul 30 03:23:18 PDT 2021
-version.buildmeta=1115
+#Tue Aug 24 11:34:08 PDT 2021
+version.buildmeta=1366
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+1115
+version.semver=0.8.0-beta+1366

From 1db47a0b22bbc57175308bd5f32dc521b5deba4e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 24 Aug 2021 19:04:51 -0700
Subject: [PATCH 208/262] Fixed kapt daemon configuration for JDK < 16.

---
 build.gradle       | 32 +++++++++++++++++---------------
 version.properties |  6 +++---
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index fdee3ae..48c77cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,21 +79,23 @@ java {
 }
 
 kotlin {
-    // Add kapt.use.worker.api=false to gradle.properties (JDK 16+)
-    // See: https://youtrack.jetbrains.com/issue/KT-45545
-    kotlinDaemonJvmArgs = [
-            "-Dfile.encoding=UTF-8",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
-    ]
+    if (JavaVersion.current() >= JavaVersion.VERSION_16) {
+        // Add kapt.use.worker.api=false to gradle.properties (JDK 16+)
+        // See: https://youtrack.jetbrains.com/issue/KT-45545
+        kotlinDaemonJvmArgs = [
+                "-Dfile.encoding=UTF-8",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+                "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
+        ]
+    }
 }
 
 kapt {
diff --git a/version.properties b/version.properties
index 50f350f..65f4e77 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Aug 24 11:34:08 PDT 2021
-version.buildmeta=1366
+#Tue Aug 24 19:02:49 PDT 2021
+version.buildmeta=1369
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+1366
+version.semver=0.8.0-beta+1369

From e0a51d21f9fcb5f228d743323c16a98ffd72e844 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 24 Aug 2021 20:41:58 -0700
Subject: [PATCH 209/262] Revert "Fixed kapt daemon configuration for JDK <
 16."

This reverts commit 1db47a0b22bbc57175308bd5f32dc521b5deba4e.
---
 build.gradle       | 32 +++++++++++++++-----------------
 version.properties |  6 +++---
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index 48c77cd..fdee3ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,23 +79,21 @@ java {
 }
 
 kotlin {
-    if (JavaVersion.current() >= JavaVersion.VERSION_16) {
-        // Add kapt.use.worker.api=false to gradle.properties (JDK 16+)
-        // See: https://youtrack.jetbrains.com/issue/KT-45545
-        kotlinDaemonJvmArgs = [
-                "-Dfile.encoding=UTF-8",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
-                "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
-        ]
-    }
+    // Add kapt.use.worker.api=false to gradle.properties (JDK 16+)
+    // See: https://youtrack.jetbrains.com/issue/KT-45545
+    kotlinDaemonJvmArgs = [
+            "-Dfile.encoding=UTF-8",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
+    ]
 }
 
 kapt {
diff --git a/version.properties b/version.properties
index 65f4e77..50f350f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Aug 24 19:02:49 PDT 2021
-version.buildmeta=1369
+#Tue Aug 24 11:34:08 PDT 2021
+version.buildmeta=1366
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+1369
+version.semver=0.8.0-beta+1366

From 6f575bf921c36b2d315552e9cca8c3b33e3b5980 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 24 Aug 2021 20:44:47 -0700
Subject: [PATCH 210/262] Fixed unnecessary JDK 16 only syntax.

---
 src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index ee728e7..75fc7f5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -384,7 +384,7 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
                 @Suppress("MagicNumber")
                 sendList(
                     sender,
-                    COUNTRIES_MAP.keys.sorted().stream().map { it.padEnd(4) }.toList(),
+                    COUNTRIES_MAP.keys.sorted().map { it.padEnd(4) },
                     14,
                     isPrivate = false,
                     isIndent = true

From f4c6bf48fa81aeb9e52410e2fb75a9cd0af38f1f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 9 Sep 2021 08:21:32 -0700
Subject: [PATCH 211/262] Trim command before processing private message.

---
 src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 6e21c00..b7b7d1a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -351,7 +351,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
         message: String
     ) {
         if (logger.isDebugEnabled) logger.debug(">>> $sender : $message")
-        val cmds = message.split(" ".toRegex(), 2)
+        val cmds = message.trim().split(" ".toRegex(), 2)
         val cmd = cmds[0].lowercase()
         val args = if (cmds.size > 1) {
             cmds[1].trim()

From 25a0850b715c8386ae46340017a6878a97055a18 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 15 Sep 2021 13:03:01 -0700
Subject: [PATCH 212/262] Now using coroutines in ThreadedModule.

---
 .idea/misc.xml                                           | 2 +-
 build.gradle                                             | 5 +++--
 .../kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt     | 9 ++++++---
 .../net/thauvin/erik/mobibot/modules/ThreadedModule.kt   | 8 +++++++-
 version.properties                                       | 6 +++---
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d755e4c..1503b42 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,5 +4,5 @@
     <pattern value="net.thauvin.erik.mobibot.modules.War" method="War" />
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="16" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="15" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index fdee3ae..11e2a93 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'application'
     id 'com.github.ben-manes.versions' version '0.39.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.18.0'
+    id 'io.gitlab.arturbosch.detekt' version '1.18.1'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
@@ -39,7 +39,7 @@ dependencies {
     compileOnly 'pircbot:pircbot:1.5.0:sources'
 
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
 
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
@@ -97,6 +97,7 @@ kotlin {
 }
 
 kapt {
+    includeCompileClasspath = false
     arguments {
         arg('semver.project.dir', projectDir)
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
index 019d152..d3408af 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -32,6 +32,7 @@
 
 package net.thauvin.erik.mobibot
 
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -47,12 +48,14 @@ import java.util.Date
  * Handles posts to pinboard.in.
  */
 object PinboardUtils {
+    private val dispatcher: CoroutineDispatcher = Dispatchers.IO
+
     /**
      * Adds a pin.
      */
     @JvmStatic
     fun addPin(poster: PinboardPoster, ircServer: String, entry: EntryLink) = runBlocking {
-        withContext(Dispatchers.Default) {
+        withContext(dispatcher) {
             poster.addPin(
                 entry.link,
                 entry.title,
@@ -68,7 +71,7 @@ object PinboardUtils {
      */
     @JvmStatic
     fun deletePin(poster: PinboardPoster, entry: EntryLink) = runBlocking {
-        withContext(Dispatchers.Default) {
+        withContext(dispatcher) {
             poster.deletePin(entry.link)
         }
     }
@@ -78,7 +81,7 @@ object PinboardUtils {
      */
     @JvmStatic
     fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) = runBlocking {
-        withContext(Dispatchers.Default) {
+        withContext(dispatcher) {
             with(entry) {
                 if (oldUrl != link) {
                     poster.deletePin(oldUrl)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
index 44a5e24..e382ac5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
@@ -31,6 +31,8 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import net.thauvin.erik.mobibot.Mobibot
 
 /**
@@ -44,7 +46,11 @@ abstract class ThreadedModule(bot: Mobibot) : AbstractModule(bot) {
         isPrivate: Boolean
     ) {
         if (isEnabled && args.isNotEmpty()) {
-            Thread { run(sender, cmd, args, isPrivate) }.start()
+            runBlocking {
+                launch {
+                    run(sender, cmd, args, isPrivate)
+                }
+            }
         } else {
             helpResponse(sender, isPrivate)
         }
diff --git a/version.properties b/version.properties
index 50f350f..d4b938a 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Aug 24 11:34:08 PDT 2021
-version.buildmeta=1366
+#Wed Sep 15 13:00:35 PDT 2021
+version.buildmeta=1390
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+1366
+version.semver=0.8.0-beta+1390

From 48b5c8a345b680bf1f6adbe4a70980aabf7b6ff5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 15 Sep 2021 16:38:36 -0700
Subject: [PATCH 213/262] Converted all Thread() to coroutines.

---
 .../net/thauvin/erik/mobibot/PinboardUtils.kt | 80 ++++++++++---------
 .../erik/mobibot/commands/ChannelFeed.kt      |  8 +-
 .../net/thauvin/erik/mobibot/modules/Joke.kt  |  6 +-
 .../thauvin/erik/mobibot/modules/Twitter.kt   | 36 +++++----
 .../thauvin/erik/mobibot/PinboardUtilsTest.kt |  8 +-
 version.properties                            |  6 +-
 6 files changed, 81 insertions(+), 63 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
index d3408af..01bd1f1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -32,10 +32,8 @@
 
 package net.thauvin.erik.mobibot
 
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
 import net.thauvin.erik.mobibot.entries.EntryLink
 import net.thauvin.erik.pinboard.PinboardPoster
 import java.time.ZoneId
@@ -48,21 +46,21 @@ import java.util.Date
  * Handles posts to pinboard.in.
  */
 object PinboardUtils {
-    private val dispatcher: CoroutineDispatcher = Dispatchers.IO
-
     /**
      * Adds a pin.
      */
     @JvmStatic
-    fun addPin(poster: PinboardPoster, ircServer: String, entry: EntryLink) = runBlocking {
-        withContext(dispatcher) {
-            poster.addPin(
-                entry.link,
-                entry.title,
-                entry.postedBy(ircServer),
-                entry.pinboardTags,
-                entry.date.toTimestamp()
-            )
+    fun addPin(poster: PinboardPoster, ircServer: String, entry: EntryLink) {
+        runBlocking {
+            launch {
+                poster.addPin(
+                    entry.link,
+                    entry.title,
+                    entry.postedBy(ircServer),
+                    entry.pinboardTags,
+                    entry.date.toTimestamp()
+                )
+            }
         }
     }
 
@@ -70,9 +68,11 @@ object PinboardUtils {
      * Deletes a pin.
      */
     @JvmStatic
-    fun deletePin(poster: PinboardPoster, entry: EntryLink) = runBlocking {
-        withContext(dispatcher) {
-            poster.deletePin(entry.link)
+    fun deletePin(poster: PinboardPoster, entry: EntryLink)  {
+        runBlocking {
+            launch {
+                poster.deletePin(entry.link)
+            }
         }
     }
 
@@ -80,28 +80,30 @@ object PinboardUtils {
      * Updates a pin.
      */
     @JvmStatic
-    fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) = runBlocking {
-        withContext(dispatcher) {
-            with(entry) {
-                if (oldUrl != link) {
-                    poster.deletePin(oldUrl)
-                    poster.addPin(
-                        link,
-                        title,
-                        entry.postedBy(ircServer),
-                        pinboardTags,
-                        date.toTimestamp()
-                    )
-                } else {
-                    poster.addPin(
-                        link,
-                        title,
-                        entry.postedBy(ircServer),
-                        pinboardTags,
-                        date.toTimestamp(),
-                        replace = true,
-                        shared = true
-                    )
+    fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink)  {
+        runBlocking {
+            launch {
+                with(entry) {
+                    if (oldUrl != link) {
+                        poster.deletePin(oldUrl)
+                        poster.addPin(
+                            link,
+                            title,
+                            entry.postedBy(ircServer),
+                            pinboardTags,
+                            date.toTimestamp()
+                        )
+                    } else {
+                        poster.addPin(
+                            link,
+                            title,
+                            entry.postedBy(ircServer),
+                            pinboardTags,
+                            date.toTimestamp(),
+                            replace = true,
+                            shared = true
+                        )
+                    }
                 }
             }
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index 9c50932..f5756da 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -32,6 +32,8 @@
 
 package net.thauvin.erik.mobibot.commands
 
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import net.thauvin.erik.mobibot.FeedReader
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.helpFormat
@@ -60,7 +62,11 @@ class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
     ) {
         with(properties[FEED_PROP]) {
             if (!isNullOrBlank()) {
-                Thread(FeedReader(bot, sender, this)).start()
+                runBlocking {
+                    launch {
+                        FeedReader(bot, sender, this@with).run()
+                    }
+                }
             } else {
                 bot.send(sender, "There is no feed setup for this channel.", false)
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
index 40b6fc0..d3e0ca8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -31,6 +31,8 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.cyan
 import net.thauvin.erik.mobibot.Utils.helpFormat
@@ -52,7 +54,9 @@ class Joke(bot: Mobibot) : ThreadedModule(bot) {
         args: String,
         isPrivate: Boolean
     ) {
-        Thread { run(sender, cmd, args, isPrivate) }.start()
+        runBlocking {
+            launch { run(sender, cmd, args, isPrivate) }
+        }
     }
 
     /**
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
index f018be9..17f2557 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -31,6 +31,8 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import net.thauvin.erik.mobibot.Constants
 import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.TwitterTimer
@@ -87,14 +89,16 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
     fun notification(msg: String) {
         with(bot) {
             if (isEnabled && !handle.isNullOrBlank()) {
-                Thread {
-                    try {
-                        post(message = msg, isDm = true)
-                        if (logger.isDebugEnabled) logger.debug("Notified @$handle: $msg")
-                    } catch (e: ModuleException) {
-                        if (logger.isWarnEnabled) logger.warn("Failed to notify @$handle: $msg", e)
+                runBlocking {
+                    launch {
+                        try {
+                            post(message = msg, isDm = true)
+                            if (logger.isDebugEnabled) logger.debug("Notified @$handle: $msg")
+                        } catch (e: ModuleException) {
+                            if (logger.isWarnEnabled) logger.warn("Failed to notify @$handle: $msg", e)
+                        }
                     }
-                }.start()
+                }
             }
         }
     }
@@ -123,16 +127,18 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
             if (isAutoPost && hasEntry(index) && LinksMgr.entries.size >= index) {
                 val entry = LinksMgr.entries[index]
                 val msg = "${entry.title} ${entry.link} via ${entry.nick} on $channel"
-                Thread {
-                    try {
-                        if (logger.isDebugEnabled) {
-                            logger.debug("Posting {} to Twitter.", EntriesUtils.buildLinkCmd(index))
+                runBlocking {
+                    launch {
+                        try {
+                            if (logger.isDebugEnabled) {
+                                logger.debug("Posting {} to Twitter.", EntriesUtils.buildLinkCmd(index))
+                            }
+                            post(message = msg, isDm = false)
+                        } catch (e: ModuleException) {
+                            if (logger.isWarnEnabled) logger.warn("Failed to post entry on Twitter.", e)
                         }
-                        post(message = msg, isDm = false)
-                    } catch (e: ModuleException) {
-                        if (logger.isWarnEnabled) logger.warn("Failed to post entry on Twitter.", e)
                     }
-                }.start()
+                }
                 removeEntry(index)
             }
         }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
index dbaf270..93ff940 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
@@ -50,18 +50,18 @@ class PinboardUtilsTest : LocalProperties() {
         val ircServer = "irc.test.com"
         val entry = EntryLink(url, "Test Example", "ErikT", "", "#mobitopia", listOf("test"))
 
-        assertTrue(PinboardUtils.addPin(pinboard, ircServer, entry), "addPin")
+        PinboardUtils.addPin(pinboard, ircServer, entry)
         assertTrue(validatePin(apiToken, url = entry.link, entry.title, entry.nick, entry.channel), "validate add")
 
         entry.link = "https://www.foo.com/"
-        assertTrue(PinboardUtils.updatePin(pinboard, ircServer, url, entry), "updatePin")
+        PinboardUtils.updatePin(pinboard, ircServer, url, entry)
         assertTrue(validatePin(apiToken, url = entry.link, ircServer), "validate update")
 
         entry.title = "Foo Title"
-        assertTrue(PinboardUtils.updatePin(pinboard, ircServer, entry.link, entry), "update title")
+        PinboardUtils.updatePin(pinboard, ircServer, entry.link, entry)
         assertTrue(validatePin(apiToken, url = entry.link, entry.title), "validate title")
 
-        assertTrue(PinboardUtils.deletePin(pinboard, entry), "daletePin")
+        PinboardUtils.deletePin(pinboard, entry)
         assertFalse(validatePin(apiToken, url = entry.link), "validate delete")
     }
 
diff --git a/version.properties b/version.properties
index d4b938a..772b346 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed Sep 15 13:00:35 PDT 2021
-version.buildmeta=1390
+#Wed Sep 15 17:27:25 PDT 2021
+version.buildmeta=1400
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+1390
+version.semver=0.8.0-beta+1400

From d7bdcd66d0d3b53cc00b110c8c3c271bbe9816de Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 4 Oct 2021 14:34:38 -0700
Subject: [PATCH 214/262] Update to Kotlin 1.5.31.

---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 11e2a93..9cf5097 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ plugins {
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.30'
-    id 'org.jetbrains.kotlin.kapt' version '1.5.30'
+    id 'org.jetbrains.kotlin.jvm' version '1.5.31'
+    id 'org.jetbrains.kotlin.kapt' version '1.5.31'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -56,10 +56,10 @@ dependencies {
     implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
 
     implementation 'org.json:json:20210307'
-    implementation 'org.jsoup:jsoup:1.14.2'
+    implementation 'org.jsoup:jsoup:1.14.3'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
-    testImplementation 'org.assertj:assertj-core:3.20.2'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation 'org.testng:testng:7.4.0'
 }
 

From 22bf1cfed504fb3f9332e6b5f7c06837c50737a8 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 25 Oct 2021 13:02:57 -0700
Subject: [PATCH 215/262] Clean up.

---
 src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt |  7 -------
 src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt   | 11 ++++-------
 .../kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt  |  4 ++--
 .../kotlin/net/thauvin/erik/mobibot/modules/Calc.kt   |  2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
index 4b93ac1..2ae420d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
@@ -31,8 +31,6 @@
  */
 package net.thauvin.erik.mobibot
 
-import java.util.Locale
-
 /**
  * The `Constants`.
  */
@@ -87,11 +85,6 @@ object Constants {
      */
     const val LINK_CMD = "L"
 
-    /**
-     * Default locale.
-     */
-    val LOCALE: Locale = Locale.getDefault()
-
     /**
      * The empty title string.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index b7b7d1a..6bfbe8a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -31,9 +31,6 @@
  */
 package net.thauvin.erik.mobibot
 
-import net.thauvin.erik.mobibot.PinboardUtils.addPin
-import net.thauvin.erik.mobibot.PinboardUtils.deletePin
-import net.thauvin.erik.mobibot.PinboardUtils.updatePin
 import net.thauvin.erik.mobibot.Utils.appendIfMissing
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.colorize
@@ -196,7 +193,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      */
     fun addPin(entry: EntryLink) {
         if (isPinboardEnabled) {
-            addPin(pinboard, ircServer, entry)
+            PinboardUtils.addPin(pinboard, ircServer, entry)
         }
     }
 
@@ -236,7 +233,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      */
     fun deletePin(index: Int, entry: EntryLink) {
         if (isPinboardEnabled) {
-            deletePin(pinboard, entry)
+            PinboardUtils.deletePin(pinboard, entry)
         }
         if (twitter.isAutoPost) {
             twitter.removeEntry(index)
@@ -506,7 +503,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      */
     fun updatePin(oldUrl: String, entry: EntryLink) {
         if (isPinboardEnabled) {
-            updatePin(pinboard, ircServer, oldUrl, entry)
+            PinboardUtils.updatePin(pinboard, ircServer, oldUrl, entry)
         }
     }
 
@@ -526,7 +523,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
          */
         @JvmStatic
         fun main(args: Array<String>) {
-            // Setup the command line options
+            // Set up the command line options
             val options = Options()
                 .addOption(
                     Constants.HELP_ARG.substring(0, 1),
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
index 01bd1f1..2d91b64 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
@@ -68,7 +68,7 @@ object PinboardUtils {
      * Deletes a pin.
      */
     @JvmStatic
-    fun deletePin(poster: PinboardPoster, entry: EntryLink)  {
+    fun deletePin(poster: PinboardPoster, entry: EntryLink) {
         runBlocking {
             launch {
                 poster.deletePin(entry.link)
@@ -80,7 +80,7 @@ object PinboardUtils {
      * Updates a pin.
      */
     @JvmStatic
-    fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink)  {
+    fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) {
         runBlocking {
             launch {
                 with(entry) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
index 6202fdf..5ff5c73 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -49,7 +49,7 @@ class Calc(bot: Mobibot) : AbstractModule(bot) {
         isPrivate: Boolean
     ) {
         if (args.isNotBlank()) {
-            with (bot) {
+            with(bot) {
                 try {
                     send(calculate(args))
                 } catch (e: IllegalArgumentException) {

From 384331b287f469d82ffe371e7e71e75c2adb623e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 25 Oct 2021 13:03:38 -0700
Subject: [PATCH 216/262] Upgraded to Kotlin 1.6.0-RC.

---
 build.gradle | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9cf5097..3207f2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ plugins {
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.5.31'
-    id 'org.jetbrains.kotlin.kapt' version '1.5.31'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.0-RC'
+    id 'org.jetbrains.kotlin.kapt' version '1.6.0-RC'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -78,24 +78,6 @@ java {
     targetCompatibility = JavaVersion.VERSION_11
 }
 
-kotlin {
-    // Add kapt.use.worker.api=false to gradle.properties (JDK 16+)
-    // See: https://youtrack.jetbrains.com/issue/KT-45545
-    kotlinDaemonJvmArgs = [
-            "-Dfile.encoding=UTF-8",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
-            "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
-    ]
-}
-
 kapt {
     includeCompileClasspath = false
     arguments {

From 0d144d4b103094d45fde87b6279ace398574a620 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 25 Oct 2021 13:16:59 -0700
Subject: [PATCH 217/262] Added Sanitize function.

---
 .../erik/mobibot/modules/ModuleException.kt   | 19 -------
 .../erik/mobibot/modules/StockQuote.kt        |  2 +-
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  5 +-
 .../net/thauvin/erik/mobibot/Sanitize.kt      | 56 +++++++++++++++++++
 .../erik/mobibot/modules/GoogleSearchTest.kt  |  5 +-
 .../mobibot/modules/ModuleExceptionTest.kt    | 11 ++--
 .../erik/mobibot/modules/StockQuoteTest.kt    |  3 +-
 7 files changed, 70 insertions(+), 31 deletions(-)
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
index 5318787..71c5004 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -31,9 +31,6 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Utils.obfuscate
-import net.thauvin.erik.mobibot.Utils.replaceEach
-
 /**
  * The `ModuleException` class.
  */
@@ -64,22 +61,6 @@ class ModuleException : Exception {
         this.debugMessage = debugMessage
     }
 
-    /**
-     * Return the sanitized message (e.g. remove API keys, etc.)
-     */
-    fun getSanitizedMessage(vararg sanitize: String): String {
-        val obfuscate = sanitize.map { it.obfuscate() }.toTypedArray()
-        return when {
-            cause?.message != null -> {
-                cause.javaClass.name + ": " + cause.message!!.replaceEach(sanitize, obfuscate)
-            }
-            message != null -> {
-                message.javaClass.name + ": " + message.replaceEach(sanitize, obfuscate)
-            }
-            else -> ""
-        }
-    }
-
     companion object {
         private const val serialVersionUID = 1L
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 333d9d4..f418185 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -190,7 +190,7 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                             val data = arrayOf(
                                 "Open" to "02. open",
                                 "High" to "03. high",
-                                "Low" to  "04. low",
+                                "Low" to "04. low",
                                 "Volume" to "06. volume",
                                 "Latest" to "07. latest trading day"
                             )
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 75fc7f5..e4deddb 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -42,7 +42,6 @@ import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoField
 import java.util.Collections
-import java.util.Locale
 
 /**
  * The WorldTime module.
@@ -65,12 +64,12 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         /**
          * Returns the current Internet (beat) Time.
          */
-        @Suppress("MagicNumber")
+        @Suppress("MagicNumber", "ImplicitDefaultLocale")
         private fun internetTime(): String {
             val zdt = ZonedDateTime.now(ZoneId.of("UTC+01:00"))
             val beats = ((zdt[ChronoField.SECOND_OF_MINUTE] + zdt[ChronoField.MINUTE_OF_HOUR] * 60
                     + zdt[ChronoField.HOUR_OF_DAY] * 3600) / 86.4).toInt()
-            return String.format(Locale.getDefault(), "%c%03d", '@', beats)
+            return String.format("%c%03d", '@', beats)
         }
 
         /**
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt b/src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt
new file mode 100644
index 0000000..9e861c6
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt
@@ -0,0 +1,56 @@
+/*
+ * Sanitize.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot
+
+import net.thauvin.erik.mobibot.Utils.obfuscate
+import net.thauvin.erik.mobibot.Utils.replaceEach
+
+object Sanitize {
+    /**
+     * Return the sanitized exception message (e.g. remove API keys, etc.)
+     */
+    fun sanitizedMessage(e: Throwable, vararg sanitize: String): String {
+        val obfuscate = sanitize.map { it.obfuscate() }.toTypedArray()
+        with(e) {
+            return when {
+                cause?.message != null -> {
+                    cause!!.javaClass.name + ": " + cause!!.message!!.replaceEach(sanitize, obfuscate)
+                }
+                message != null -> {
+                    message!!.javaClass.name + ": " + message!!.replaceEach(sanitize, obfuscate)
+                }
+                else -> ""
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index aa4d98e..100689d 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -32,6 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.LocalProperties
+import net.thauvin.erik.mobibot.Sanitize.sanitizedMessage
 import net.thauvin.erik.mobibot.modules.GoogleSearch.Companion.searchGoogle
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
@@ -63,8 +64,8 @@ class GoogleSearchTest : LocalProperties() {
                 .describedAs("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
-            if ("true" == System.getenv("CI") && apiKey.isNotBlank() && cseKey.isNotBlank()) {
-                throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey, cseKey), e)
+            if ("true" == System.getenv("CI") && (apiKey.isNotBlank() || cseKey.isNotBlank())) {
+                throw ModuleException(e.debugMessage, sanitizedMessage(e, apiKey, cseKey), e)
             } else {
                 throw e
             }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
index 4e63def..b6250c9 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
@@ -31,6 +31,7 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import net.thauvin.erik.mobibot.Sanitize.sanitizedMessage
 import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.DataProvider
 import org.testng.annotations.Test
@@ -66,21 +67,21 @@ class ModuleExceptionTest {
     }
 
     @Test
-    fun testGetSanitizedMessage() {
+    fun testSanitizeMessage() {
         val apiKey = "1234567890"
         var e = ModuleException(debugMessage, message, IOException("URL http://foo.com?apiKey=$apiKey&userID=me"))
-        assertThat(e.getSanitizedMessage(apiKey)).describedAs("sanitized url")
+        assertThat(sanitizedMessage(e, apiKey)).describedAs("sanitized url")
             .contains("xxxxxxxxxx").doesNotContain(apiKey)
 
         e = ModuleException(debugMessage, message, null)
-        assertThat(e.getSanitizedMessage(apiKey)).describedAs("no cause").contains(message)
+        assertThat(sanitizedMessage(e, apiKey)).describedAs("no cause").contains(message)
 
         val msg: String? = null
         e = ModuleException(debugMessage, msg, IOException(msg))
-        assertThat(e.getSanitizedMessage(apiKey)).describedAs("no message").isEqualTo("")
+        assertThat(sanitizedMessage(e, apiKey)).describedAs("no message").isEqualTo("")
 
 
         e = ModuleException(msg, msg, IOException(apiKey))
-        assertThat(e.getSanitizedMessage(apiKey)).describedAs("null message").doesNotContain(apiKey)
+        assertThat(sanitizedMessage(e, apiKey)).describedAs("null message").doesNotContain(apiKey)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index 7f46935..d8a00f3 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -32,6 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.LocalProperties
+import net.thauvin.erik.mobibot.Sanitize.sanitizedMessage
 import net.thauvin.erik.mobibot.modules.StockQuote.Companion.getQuote
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
@@ -64,7 +65,7 @@ class StockQuoteTest : LocalProperties() {
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
             if ("true" == System.getenv("CI") && apiKey.isNotBlank()) {
-                throw ModuleException(e.debugMessage, e.getSanitizedMessage(apiKey), e)
+                throw ModuleException(e.debugMessage, sanitizedMessage(e, apiKey), e)
             } else {
                 throw e
             }

From 95823db1d91c918704125ae37813c19dee428506 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 25 Oct 2021 17:27:55 -0700
Subject: [PATCH 218/262] Improved sanitize function.

---
 .../net/thauvin/erik/mobibot/FeedReader.kt    |  2 +-
 .../erik/mobibot/commands/tell/TellMessage.kt |  4 +--
 .../net/thauvin/erik/mobibot/Sanitize.kt      | 28 +++++++++++--------
 .../erik/mobibot/modules/GoogleSearchTest.kt  |  6 ++--
 .../mobibot/modules/ModuleExceptionTest.kt    | 28 +++++++++++--------
 .../erik/mobibot/modules/StockQuoteTest.kt    |  6 ++--
 6 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index 5930ca2..3ee5aad 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -42,7 +42,7 @@ import java.io.IOException
 import java.net.URL
 
 /**
- * Reads a RSS feed.
+ * Reads an RSS feed.
  */
 class FeedReader(
     // Bot
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
index 6a058f6..2f88e86 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
@@ -66,7 +66,7 @@ class TellMessage internal constructor(
     var id: String = queued.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))
 
     /**
-     * Returns {@code true) if a notification was send.
+     * Returns {@code true) if a notification was sent.
      */
     var isNotified = false
 
@@ -82,7 +82,7 @@ class TellMessage internal constructor(
         }
 
     /**
-     * Return the message creating date.
+     * Returns the message creating date.
      */
     var receptionDate: LocalDateTime = LocalDateTime.MIN
 
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt b/src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt
index 9e861c6..e8cc448 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt
@@ -34,23 +34,29 @@ package net.thauvin.erik.mobibot
 
 import net.thauvin.erik.mobibot.Utils.obfuscate
 import net.thauvin.erik.mobibot.Utils.replaceEach
+import net.thauvin.erik.mobibot.modules.ModuleException
 
 object Sanitize {
     /**
-     * Return the sanitized exception message (e.g. remove API keys, etc.)
+     * Returns a sanitized exception to avoid displaying api keys, etc. in CI logs.
      */
-    fun sanitizedMessage(e: Throwable, vararg sanitize: String): String {
-        val obfuscate = sanitize.map { it.obfuscate() }.toTypedArray()
-        with(e) {
-            return when {
-                cause?.message != null -> {
-                    cause!!.javaClass.name + ": " + cause!!.message!!.replaceEach(sanitize, obfuscate)
+    fun sanitizeException(e: ModuleException, vararg sanitize: String): ModuleException {
+        var sanitizedException = e
+        val search = sanitize.filter { it.isNotBlank() }.toTypedArray()
+        if (search.isNotEmpty()) {
+            val obfuscate = search.map { it.obfuscate() }.toTypedArray()
+            with(e) {
+                if (cause?.message != null) {
+                    sanitizedException = ModuleException(
+                        debugMessage,
+                        cause!!.javaClass.name + ": " + cause!!.message!!.replaceEach(search, obfuscate),
+                        this
+                    )
+                } else if (message != null) {
+                    sanitizedException = ModuleException(debugMessage, message!!.replaceEach(search, obfuscate), this)
                 }
-                message != null -> {
-                    message!!.javaClass.name + ": " + message!!.replaceEach(sanitize, obfuscate)
-                }
-                else -> ""
             }
         }
+        return sanitizedException
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index 100689d..5dfc1f2 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.LocalProperties
-import net.thauvin.erik.mobibot.Sanitize.sanitizedMessage
+import net.thauvin.erik.mobibot.Sanitize.sanitizeException
 import net.thauvin.erik.mobibot.modules.GoogleSearch.Companion.searchGoogle
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
@@ -64,8 +64,8 @@ class GoogleSearchTest : LocalProperties() {
                 .describedAs("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
-            if ("true" == System.getenv("CI") && (apiKey.isNotBlank() || cseKey.isNotBlank())) {
-                throw ModuleException(e.debugMessage, sanitizedMessage(e, apiKey, cseKey), e)
+            if ("true" == System.getenv("CI")) {
+                throw sanitizeException(e, apiKey, cseKey)
             } else {
                 throw e
             }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
index b6250c9..707f617 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
@@ -1,7 +1,7 @@
 /*
- * ModuleExceptionTest.java
+ * ModuleExceptionTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,7 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Sanitize.sanitizedMessage
+import net.thauvin.erik.mobibot.Sanitize.sanitizeException
 import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.DataProvider
 import org.testng.annotations.Test
@@ -63,25 +63,31 @@ class ModuleExceptionTest {
 
     @Test(dataProvider = "dp")
     fun testGetMessage(e: ModuleException) {
-        assertThat(e.message).describedAs("get message").isEqualTo(message)
+        assertThat(e).describedAs("get message").hasMessage(message)
     }
 
     @Test
     fun testSanitizeMessage() {
         val apiKey = "1234567890"
         var e = ModuleException(debugMessage, message, IOException("URL http://foo.com?apiKey=$apiKey&userID=me"))
-        assertThat(sanitizedMessage(e, apiKey)).describedAs("sanitized url")
-            .contains("xxxxxxxxxx").doesNotContain(apiKey)
+        assertThat(sanitizeException(e, apiKey, "", "me")).describedAs("sanitized url")
+            .hasMessageContainingAll("xxxxxxxxxx", "userID=xx").hasMessageNotContainingAny(apiKey, "me")
 
         e = ModuleException(debugMessage, message, null)
-        assertThat(sanitizedMessage(e, apiKey)).describedAs("no cause").contains(message)
+        assertThat(sanitizeException(e, apiKey)).describedAs("no cause").hasMessage(message)
+
+        e = ModuleException(debugMessage, message, IOException())
+        assertThat(sanitizeException(e, apiKey)).describedAs("no cause message").hasMessage(message)
+
+        e = ModuleException(apiKey)
+        assertThat(sanitizeException(e, apiKey)).describedAs("api key in message").hasMessageNotContaining(apiKey)
 
         val msg: String? = null
         e = ModuleException(debugMessage, msg, IOException(msg))
-        assertThat(sanitizedMessage(e, apiKey)).describedAs("no message").isEqualTo("")
+        assertThat(sanitizeException(e, apiKey).message).describedAs("null message").isNull()
 
-
-        e = ModuleException(msg, msg, IOException(apiKey))
-        assertThat(sanitizedMessage(e, apiKey)).describedAs("null message").doesNotContain(apiKey)
+        e = ModuleException(msg, msg, IOException("foo is $apiKey"))
+        assertThat(sanitizeException(e, "   ", apiKey, "foo").message).describedAs("key in cause")
+            .doesNotContain(apiKey).endsWith("xxx is xxxxxxxxxx")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index d8a00f3..b1dc7c0 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -32,7 +32,7 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.LocalProperties
-import net.thauvin.erik.mobibot.Sanitize.sanitizedMessage
+import net.thauvin.erik.mobibot.Sanitize.sanitizeException
 import net.thauvin.erik.mobibot.modules.StockQuote.Companion.getQuote
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
@@ -64,8 +64,8 @@ class StockQuoteTest : LocalProperties() {
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
-            if ("true" == System.getenv("CI") && apiKey.isNotBlank()) {
-                throw ModuleException(e.debugMessage, sanitizedMessage(e, apiKey), e)
+            if ("true" == System.getenv("CI")) {
+                throw sanitizeException(e, apiKey)
             } else {
                 throw e
             }

From 611420757ad945a4c50bab7877779d93d2c76e2a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 25 Oct 2021 18:25:33 -0700
Subject: [PATCH 219/262] Updated copyright.

---
 src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt            | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt   | 2 +-
 src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt     | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt | 2 +-
 .../net/thauvin/erik/mobibot/commands/links/LinksMgr.kt       | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt    | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/commands/links/View.kt    | 2 +-
 .../net/thauvin/erik/mobibot/commands/tell/TellMessage.kt     | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt   | 2 +-
 .../net/thauvin/erik/mobibot/modules/ModuleException.kt       | 4 ++--
 .../kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt | 2 +-
 src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt  | 2 +-
 src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt     | 2 +-
 src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt | 2 +-
 src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt    | 4 ++--
 src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt         | 4 ++--
 src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt  | 2 +-
 .../net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt | 2 +-
 src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt  | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt     | 2 +-
 src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt  | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt    | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt   | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt   | 2 +-
 26 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
index 5496fd9..1a0e8dd 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
@@ -1,5 +1,5 @@
 /*
- * Addons.java
+ * Addons.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index f5756da..8dbe942 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -1,5 +1,5 @@
 /*
- * Feed.kt
+ * ChannelFeed.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
index 230539f..bffd1f2 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
@@ -1,5 +1,5 @@
 /*
- * Info.java
+ * Info.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
index ebe7067..2bfc57b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -1,5 +1,5 @@
 /*
- * Links.kt
+ * Comment.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index ce0b797..fd7eb27 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -1,5 +1,5 @@
 /*
- * Links.kt
+ * LinksMgr.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 77c9b43..140f70c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -1,5 +1,5 @@
 /*
- * Links.kt
+ * Posting.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
index e2b6d8f..ab7a983 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -1,5 +1,5 @@
 /*
- * Links.kt
+ * Tags.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
index 45da0f5..e845a66 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -1,5 +1,5 @@
 /*
- * Links.kt
+ * View.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
index 2f88e86..47521d4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
@@ -1,7 +1,7 @@
 /*
  * TellMessage.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index c0247c3..cf0bf35 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -1,7 +1,7 @@
 /*
  * EntriesUtils.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
index 71c5004..4c6867a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -1,7 +1,7 @@
 /*
- * ModuleException.kit
+ * ModuleException.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
index e382ac5..d1d58d0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
@@ -1,5 +1,5 @@
 /*
- * ThreadedModule.java
+ * ThreadedModule.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
index 741d557..35409f7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
@@ -1,7 +1,7 @@
 /*
  * ErrorMessage.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
index 126fd91..c9fa9dc 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
@@ -1,7 +1,7 @@
 /*
  * NoticeMessage.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
index 6bbade8..2953b7a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
@@ -1,7 +1,7 @@
 /*
  * PrivateMessage.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
index 384bc05..397b3cf 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
@@ -1,7 +1,7 @@
 /*
  * PublicMessage.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
index 3360242..234f84b 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
@@ -1,7 +1,7 @@
 /*
- * FeedReaderTest.java
+ * FeedReaderTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 16434f2..2dc0ef8 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -1,7 +1,7 @@
 /*
- * UtilsTest.java
+ * UtilsTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
index 8a78beb..ad0740e 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -1,7 +1,7 @@
 /*
  * CalcTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
index 88515cc..037ba4e 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
@@ -1,7 +1,7 @@
 /*
  * CurrencyConverterTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
index eabd984..62397d9 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
@@ -1,7 +1,7 @@
 /*
  * JokeTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
index 9fbf64c..bc9c3d4 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -1,7 +1,7 @@
 /*
  * LookupTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
index 1eba3b7..e79fbcc 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
@@ -1,7 +1,7 @@
 /*
  * PingTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
index ce5c36d..2257ac4 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
@@ -1,7 +1,7 @@
 /*
  * TwitterTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
index 0aea8d2..1c503ca 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
@@ -1,7 +1,7 @@
 /*
  * Weather2Test.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index fa5dd90..15f0beb 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -1,7 +1,7 @@
 /*
  * WordTimeTest.kt
  *
- * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

From 2a46761dc57c47b268a90faddf7bafdf838a2279 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 25 Oct 2021 23:41:52 -0700
Subject: [PATCH 220/262] Cleaned up tests.

---
 .../erik/mobibot/commands/tell/TellMessageTest.kt    |  5 ++---
 .../thauvin/erik/mobibot/entries/EntryLinkTest.kt    | 11 +++++------
 .../thauvin/erik/mobibot/modules/CryptoPricesTest.kt | 10 ++++------
 .../erik/mobibot/modules/CurrencyConverterTest.kt    |  5 ++---
 .../net/thauvin/erik/mobibot/modules/JokeTest.kt     |  2 +-
 .../net/thauvin/erik/mobibot/modules/LookupTest.kt   |  4 ++--
 .../erik/mobibot/modules/ModuleExceptionTest.kt      |  3 ++-
 .../thauvin/erik/mobibot/modules/StockQuoteTest.kt   | 12 ++++++++----
 .../net/thauvin/erik/mobibot/modules/WordTimeTest.kt |  8 +++-----
 9 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index 7f5de32..86422ca 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -51,9 +51,8 @@ class TellMessageTest {
         val recipient = "recipient"
         val sender = "sender"
         val tellMessage = TellMessage(sender, recipient, message)
-        assertThat(tellMessage.sender).describedAs(sender).isEqualTo(sender)
-        assertThat(tellMessage.recipient).describedAs(recipient).isEqualTo(recipient)
-        assertThat(tellMessage.message).describedAs(message).isEqualTo(message)
+        assertThat(tellMessage).extracting("sender", "recipient", "message")
+            .containsExactly(sender, recipient, message)
         assertThat(isValidDate(tellMessage.queued)).describedAs("queued is valid date/time").isTrue
         assertThat(tellMessage.isMatch(sender)).describedAs("match sender").isTrue
         assertThat(tellMessage.isMatch(recipient)).describedAs("match recipient").isTrue
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
index 7b4c159..347b508 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -61,19 +61,18 @@ class EntryLinkTest {
         assertThat(entryLink.comments.size).describedAs("getComments().size() == 5").isEqualTo(i)
         i = 0
         for (comment in entryLink.comments) {
-            assertThat(comment.comment).describedAs("getComment($i)").isEqualTo("c$i")
-            assertThat(comment.nick).describedAs("getNick($i)").isEqualTo("u$i")
+            assertThat(comment).extracting("comment", "nick").containsExactly("c$i", "u$i")
             i++
         }
         val r = SecureRandom()
         while (entryLink.comments.size > 0) {
             entryLink.deleteComment(r.nextInt(entryLink.comments.size))
         }
-        assertThat(entryLink.comments.isNotEmpty()).describedAs("hasComments()").isFalse
+        assertThat(entryLink.comments).describedAs("hasComments()").isEmpty()
         entryLink.addComment("nothing", "nobody")
         entryLink.setComment(0, "something", "somebody")
-        assertThat(entryLink.getComment(0).nick).describedAs("getNick(somebody)").isEqualTo("somebody")
-        assertThat(entryLink.getComment(0).comment).describedAs("getComment(something)").isEqualTo("something")
+        assertThat(entryLink.getComment(0)).describedAs("get first comment").extracting("nick", "comment")
+            .containsExactly("somebody", "something")
     }
 
     @Test
@@ -104,7 +103,7 @@ class EntryLinkTest {
             assertThat(tag.name).describedAs("tag.getName($i)").isEqualTo("tag" + (i + 1))
         }
         assertThat(entryLink.tags.size).describedAs("getTags().size() is 5").isEqualTo(5)
-        assertThat(entryLink.tags.isNotEmpty()).describedAs("hasTags() is true").isTrue
+        assertThat(entryLink.tags).describedAs("hasTags() is true").isNotEmpty
         entryLink.setTags("-tag5")
         entryLink.setTags("+mobitopia")
         entryLink.setTags("tag4")
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
index 98a72cb..8d0c70a 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
@@ -43,13 +43,11 @@ class CryptoPricesTest {
     @Throws(ModuleException::class)
     fun testMarketPrice() {
         var price = currentPrice(listOf("BTC"))
-        assertThat(price.base).describedAs("is BTC").isEqualTo("BTC")
-        assertThat(price.currency).describedAs("is USD").isEqualTo("USD")
-        assertThat(price.amount.signum() > 0).describedAs("BTC > 0").isTrue
+        assertThat(price).extracting("base", "currency").containsExactly("BTC", "USD")
+        assertThat(price.amount.signum()).describedAs("BTC > 0").isGreaterThan(0)
 
         price = currentPrice(listOf("ETH", "EUR"))
-        assertThat(price.base).describedAs("is ETH").isEqualTo("ETH")
-        assertThat(price.currency).describedAs("is EUR").isEqualTo("EUR")
-        assertThat(price.amount.signum() > 0).describedAs("ETH > 0").isTrue
+        assertThat(price).extracting("base", "currency").containsExactly("ETH", "EUR")
+        assertThat(price.amount.signum()).describedAs("ETH > 0").isGreaterThan(0)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
index 037ba4e..84fa190 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
@@ -57,8 +57,7 @@ class CurrencyConverterTest {
         assertThat(convertCurrency("100 USD").msg).describedAs("100 USD").contains("Invalid query.")
         val rates = currencyRates()
         assertThat(rates.size).describedAs("currencyRates.size == 33").isEqualTo(33)
-        assertThat(rates).describedAs("currencyRates(EUR)").contains("EUR:        1")
-        assertThat(rates.stream().anyMatch { it.matches("USD: .*".toRegex()) })
-            .describedAs("currencyRates(USD)").isTrue
+        assertThat(rates).describedAs("currencyRates(EUR< USD)").contains("EUR:        1")
+            .anyMatch { it.matches("USD: .*".toRegex()) }
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
index 62397d9..28fd592 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
@@ -42,7 +42,7 @@ class JokeTest {
     @Test
     @Throws(ModuleException::class)
     fun testRandomJoke() {
-        assertThat(randomJoke().msg.isNotEmpty()).describedAs("randomJoke() > 0").isTrue
+        assertThat(randomJoke().msg).describedAs("randomJoke() > 0").isNotEmpty
         assertThat(randomJoke().msg).describedAs("randomJoke()").containsIgnoringCase("chuck")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
index bc9c3d4..211afdd 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -51,7 +51,7 @@ class LookupTest {
     @Throws(Exception::class)
     fun testWhois() {
         val result = whois("17.178.96.59", Lookup.WHOIS_HOST)
-        assertThat(result.stream().anyMatch { m: String -> m.contains("Apple Inc.") })
-            .describedAs("whois(17.178.96.59/Apple Inc.").isTrue
+        assertThat(result).describedAs("whois(17.178.96.59/Apple Inc.")
+            .anyMatch { it.contains("Apple Inc.") }
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
index 707f617..4ad980b 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
@@ -71,7 +71,8 @@ class ModuleExceptionTest {
         val apiKey = "1234567890"
         var e = ModuleException(debugMessage, message, IOException("URL http://foo.com?apiKey=$apiKey&userID=me"))
         assertThat(sanitizeException(e, apiKey, "", "me")).describedAs("sanitized url")
-            .hasMessageContainingAll("xxxxxxxxxx", "userID=xx").hasMessageNotContainingAny(apiKey, "me")
+            .hasMessageContainingAll("xxxxxxxxxx", "userID=xx", "java.io.IOException")
+            .hasMessageNotContainingAny(apiKey, "me")
 
         e = ModuleException(debugMessage, message, null)
         assertThat(sanitizeException(e, apiKey)).describedAs("no cause").hasMessage(message)
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index b1dc7c0..4eb4081 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -42,6 +42,10 @@ import org.testng.annotations.Test
  * The `StockQuoteTest` class.
  */
 class StockQuoteTest : LocalProperties() {
+    private fun buildMatch(label: String): String {
+        return "${label}:[ ]+[0-9.]+".prependIndent()
+    }
+
     @Test
     @Throws(ModuleException::class)
     fun testGetQuote() {
@@ -49,10 +53,10 @@ class StockQuoteTest : LocalProperties() {
         try {
             val messages = getQuote("apple inc", apiKey)
             assertThat(messages).describedAs("response not empty").isNotEmpty
-            assertThat(messages[0].msg).describedAs("same stock symbol").startsWith("Symbol: AAPL")
-            assertThat(messages[1].msg).describedAs("price label").startsWith("Price:    ".prependIndent())
-            assertThat(messages[2].msg).describedAs("previous label").startsWith("Previous: ".prependIndent())
-            assertThat(messages[3].msg).describedAs("open label").startsWith("Open:     ".prependIndent())
+            assertThat(messages[0].msg).describedAs("same stock symbol").matches("Symbol: AAPL .*")
+            assertThat(messages[1].msg).describedAs("price label").matches(buildMatch("Price"))
+            assertThat(messages[2].msg).describedAs("previous label").matches(buildMatch("Previous"))
+            assertThat(messages[3].msg).describedAs("open label").matches(buildMatch("Open"))
             try {
                 getQuote("blahfoo", apiKey)
             } catch (e: ModuleException) {
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index 15f0beb..49e63c1 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -48,16 +48,14 @@ class WordTimeTest {
     fun testTime() {
         assertThat(time("PST").msg).describedAs("PST").endsWith(bold("Los Angeles"))
         assertThat(time("BLAH").isError).describedAs("BLAH").isTrue
-        assertThat(time("BEAT").msg).describedAs(BEATS_KEYWORD).endsWith(BEATS_KEYWORD).contains("@")
+        assertThat(time("BEAT").msg).describedAs(BEATS_KEYWORD).matches("[\\w ]+: .?@\\d{3}+.? .beats")
     }
 
     @Test
     @Throws(ZoneRulesException::class)
     fun testCountries() {
-        COUNTRIES_MAP.toSortedMap().forEach {
-            if (it.value != BEATS_KEYWORD) {
-                ZoneId.of(it.value)
-            }
+        COUNTRIES_MAP.filter { it.value != BEATS_KEYWORD }.forEach {
+            ZoneId.of(it.value)
         }
     }
 }

From 9fb870648e9dced0c0faf490a7720bb1a70caab0 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Mon, 8 Nov 2021 13:54:48 -0800
Subject: [PATCH 221/262] Moved to PircBotX and assertk.

---
 .idea/jarRepositories.xml                     |   5 +
 .idea/mobibot.iml                             |   7 +
 build.gradle                                  |  28 +-
 config/detekt/baseline.xml                    |  88 ++-
 properties/log4j2.xml                         |  32 +-
 properties/mobibot.properties                 |   7 +-
 .../net/thauvin/erik/mobibot/modules/War.java |  22 +-
 .../kotlin/net/thauvin/erik/mobibot/Addons.kt |  27 +-
 .../net/thauvin/erik/mobibot/Constants.kt     |  17 +-
 .../net/thauvin/erik/mobibot/FeedReader.kt    |  44 +-
 .../net/thauvin/erik/mobibot/Mobibot.kt       | 631 +++++-------------
 .../mobibot/{PinboardUtils.kt => Pinboard.kt} |  83 ++-
 .../net/thauvin/erik/mobibot/TwitterOAuth.kt  |   1 -
 .../net/thauvin/erik/mobibot/TwitterTimer.kt  |   5 +-
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  |  72 +-
 .../erik/mobibot/commands/AbstractCommand.kt  |  26 +-
 .../thauvin/erik/mobibot/commands/AddLog.kt   |  70 --
 .../erik/mobibot/commands/ChannelFeed.kt      |  19 +-
 .../thauvin/erik/mobibot/commands/Cycle.kt    |  36 +-
 .../thauvin/erik/mobibot/commands/Debug.kt    |  59 --
 .../net/thauvin/erik/mobibot/commands/Die.kt  |  36 +-
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  58 +-
 .../net/thauvin/erik/mobibot/commands/Info.kt |  48 +-
 .../net/thauvin/erik/mobibot/commands/Me.kt   |  22 +-
 .../thauvin/erik/mobibot/commands/Modules.kt  |  34 +-
 .../net/thauvin/erik/mobibot/commands/Msg.kt  |  27 +-
 .../net/thauvin/erik/mobibot/commands/Nick.kt |  22 +-
 .../thauvin/erik/mobibot/commands/Recap.kt    |  20 +-
 .../net/thauvin/erik/mobibot/commands/Say.kt  |  22 +-
 .../thauvin/erik/mobibot/commands/Users.kt    |  33 +-
 .../thauvin/erik/mobibot/commands/Versions.kt |  22 +-
 .../erik/mobibot/commands/links/Comment.kt    | 103 ++-
 .../erik/mobibot/commands/links/LinksMgr.kt   | 127 ++--
 .../erik/mobibot/commands/links/Posting.kt    | 112 ++--
 .../erik/mobibot/commands/links/Tags.kt       |  35 +-
 .../erik/mobibot/commands/links/View.kt       |  51 +-
 .../erik/mobibot/commands/tell/Tell.kt        | 163 ++---
 .../erik/mobibot/commands/tell/TellMessage.kt |   4 +-
 .../mobibot/commands/tell/TellMessagesMgr.kt  |  39 +-
 .../{commands/Kill.kt => entries/Entries.kt}  |  38 +-
 .../erik/mobibot/entries/EntriesMgr.kt        | 262 --------
 .../erik/mobibot/entries/EntriesUtils.kt      |  10 +-
 .../thauvin/erik/mobibot/entries/EntryLink.kt |  15 +-
 .../thauvin/erik/mobibot/entries/FeedsMgr.kt  | 190 ++++++
 .../erik/mobibot/modules/AbstractModule.kt    |  18 +-
 .../net/thauvin/erik/mobibot/modules/Calc.kt  |  35 +-
 .../erik/mobibot/modules/CryptoPrices.kt      |  48 +-
 .../erik/mobibot/modules/CurrencyConverter.kt | 113 ++--
 .../net/thauvin/erik/mobibot/modules/Dice.kt  |  32 +-
 .../erik/mobibot/modules/GoogleSearch.kt      |  64 +-
 .../net/thauvin/erik/mobibot/modules/Joke.kt  |  27 +-
 .../thauvin/erik/mobibot/modules/Lookup.kt    |  78 +--
 .../net/thauvin/erik/mobibot/modules/Ping.kt  |  14 +-
 .../erik/mobibot/modules/RockPaperScissors.kt |  23 +-
 .../erik/mobibot/modules/StockQuote.kt        | 114 ++--
 .../erik/mobibot/modules/ThreadedModule.kt    |  24 +-
 .../thauvin/erik/mobibot/modules/Twitter.kt   | 105 ++-
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  39 +-
 .../thauvin/erik/mobibot/modules/WorldTime.kt | 611 ++++++++---------
 .../{Sanitize.kt => ExceptionSanitizer.kt}    |  19 +-
 .../thauvin/erik/mobibot/FeedReaderTest.kt    |  28 +-
 .../{PinboardUtilsTest.kt => PinboardTest.kt} |  28 +-
 .../net/thauvin/erik/mobibot/UtilsTest.kt     | 105 +--
 .../mobibot/commands/tell/TellMessageTest.kt  |  30 +-
 .../erik/mobibot/entries/EntryLinkTest.kt     |  57 +-
 .../erik/mobibot/entries/FeedMgrTest.kt       | 121 ++++
 .../thauvin/erik/mobibot/modules/CalcTest.kt  |  18 +-
 .../erik/mobibot/modules/CryptoPricesTest.kt  |  21 +-
 .../mobibot/modules/CurrencyConverterTest.kt  |  43 +-
 .../thauvin/erik/mobibot/modules/DiceTest.kt  |   9 +-
 .../erik/mobibot/modules/GoogleSearchTest.kt  |  47 +-
 .../thauvin/erik/mobibot/modules/JokeTest.kt  |  11 +-
 .../erik/mobibot/modules/LookupTest.kt        |   9 +-
 .../mobibot/modules/ModuleExceptionTest.kt    |  38 +-
 .../thauvin/erik/mobibot/modules/PingTest.kt  |   8 +-
 .../mobibot/modules/RockPaperScissorsTest.kt  |  22 +-
 .../erik/mobibot/modules/StockQuoteTest.kt    |  44 +-
 .../erik/mobibot/modules/TwitterTest.kt       |  10 +-
 .../erik/mobibot/modules/Weather2Test.kt      |  61 +-
 .../erik/mobibot/modules/WordTimeTest.kt      |  27 +-
 .../thauvin/erik/mobibot/msg/TestMessage.kt   |   9 +-
 src/test/resources/current.xml                |  36 +
 version.properties                            |   6 +-
 83 files changed, 2347 insertions(+), 2577 deletions(-)
 create mode 100644 .idea/mobibot.iml
 rename src/main/kotlin/net/thauvin/erik/mobibot/{PinboardUtils.kt => Pinboard.kt} (63%)
 delete mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
 delete mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/commands/Debug.kt
 rename src/main/kotlin/net/thauvin/erik/mobibot/{commands/Kill.kt => entries/Entries.kt} (74%)
 delete mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
 create mode 100644 src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt
 rename src/test/kotlin/net/thauvin/erik/mobibot/{Sanitize.kt => ExceptionSanitizer.kt} (82%)
 rename src/test/kotlin/net/thauvin/erik/mobibot/{PinboardUtilsTest.kt => PinboardTest.kt} (81%)
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt
 create mode 100644 src/test/resources/current.xml

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 8920634..75b7aaa 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -31,5 +31,10 @@
       <option name="name" value="MavenLocal" />
       <option name="url" value="file:$MAVEN_REPOSITORY$/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
new file mode 100644
index 0000000..b03a311
--- /dev/null
+++ b/.idea/mobibot.iml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="idePathPrefix" value="bin/main" />
+    <option name="sqPathPrefix" value="src/main/kotlin" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 3207f2a..020006e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,12 @@ plugins {
     id 'application'
     id 'com.github.ben-manes.versions' version '0.39.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.18.1'
+    id 'io.gitlab.arturbosch.detekt' version '1.19.0-RC1'
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.6.0-RC'
-    id 'org.jetbrains.kotlin.kapt' version '1.6.0-RC'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.0-RC2'
+    id 'org.jetbrains.kotlin.kapt' version '1.6.0-RC2'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -22,12 +22,13 @@ mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
         log4j: '2.14.1',
-        pmd  : '6.35.0',
+        pmd  : '6.40.0',
 ]
 
 repositories {
     mavenLocal()
     mavenCentral()
+    maven { url 'https://jitpack.io' }
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
 }
 
@@ -35,8 +36,13 @@ dependencies {
     kapt(semverProcessor)
     compileOnly(semverProcessor)
 
-    implementation 'pircbot:pircbot:1.5.0'
-    compileOnly 'pircbot:pircbot:1.5.0:sources'
+    implementation 'com.github.pircbotx:pircbotx:-SNAPSHOT'
+
+    implementation 'org.apache.commons:commons-text:1.9'
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.slf4j:slf4j-api:1.7.32'
+    implementation 'commons-codec:commons-codec:1.15'
+    implementation 'com.google.guava:guava:31.0.1-jre'
 
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
@@ -44,11 +50,12 @@ dependencies {
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
-    implementation 'commons-cli:commons-cli:1.4'
+
+    implementation 'commons-cli:commons-cli:1.5.0'
     implementation 'commons-net:commons-net:3.8.0'
 
     implementation 'com.rometools:rome:1.16.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     implementation 'net.aksingh:owm-japis:2.5.3.0'
     implementation 'net.objecthunter:exp4j:0.4.8'
 
@@ -59,7 +66,9 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.14.3'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
-    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'com.willowtreeapps.assertk:assertk-jvm:0.25'
+//    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
+//    testImplementation "org.mockito:mockito-core:4.0.0"
     testImplementation 'org.testng:testng:7.4.0'
 }
 
@@ -117,6 +126,7 @@ jar {
     manifest.attributes('Main-Class': mainClassName,
             'Class-Path': '. ./lib/' + configurations.runtimeClasspath.collect { it.getName() }.join(' ./lib/'))
     archiveVersion.set("")
+    exclude('log4j2.xml')
 }
 
 clean {
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index c3f468f..9bc0b96 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -2,54 +2,76 @@
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
-    <ID>ComplexMethod:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
+    <ID>ComplexMethod:FeedsMgr.kt$FeedsMgr.Companion$ fun saveFeed(entries: Entries, currentFile: String = currentXml)</ID>
     <ID>ComplexMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
-    <ID>LongMethod:EntriesMgr.kt$EntriesMgr$ fun saveEntries( bot: Mobibot, entries: List&lt;EntryLink&gt;, history: MutableList&lt;String&gt;, isDayBackup: Boolean )</ID>
-    <ID>LongMethod:Mobibot.kt$Mobibot.Companion$ @JvmStatic fun main(args: Array&lt;String&gt;)</ID>
+    <ID>LongMethod:FeedsMgr.kt$FeedsMgr.Companion$ fun saveFeed(entries: Entries, currentFile: String = currentXml)</ID>
+    <ID>LongMethod:Mobibot.kt$Mobibot.Companion$@Throws(Exception::class) @JvmStatic fun main(args: Array&lt;String&gt;)</ID>
     <ID>LongMethod:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
-    <ID>LongParameterList:Addons.kt$Addons$(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean)</ID>
-    <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, cmd: String, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
-    <ID>LongParameterList:Comment.kt$Comment$( bot: Mobibot, sender: String, isOp: Boolean, entry: EntryLink, index: Int, commentIndex: Int )</ID>
-    <ID>LongParameterList:Comment.kt$Comment$(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int)</ID>
-    <ID>LongParameterList:Mobibot.kt$Mobibot$( nick: String, list: List&lt;String&gt;, maxPerLine: Int, separator: String = " ", isPrivate: Boolean, isBold: Boolean = false, isIndent: Boolean = false )</ID>
+    <ID>LongParameterList:Comment.kt$Comment$( channel: String, cmd: String, entry: EntryLink, entryIndex: Int, commentIndex: Int, event: GenericMessageEvent )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
+    <ID>MagicNumber:Comment.kt$Comment$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$11</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$3</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$4</ID>
+    <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter.Companion$8</ID>
+    <ID>MagicNumber:Cycle.kt$Cycle$10</ID>
+    <ID>MagicNumber:Cycle.kt$Cycle$1000L</ID>
+    <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
+    <ID>MagicNumber:Mobibot.kt$Mobibot$8</ID>
+    <ID>MagicNumber:Modules.kt$Modules$7</ID>
+    <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
+    <ID>MagicNumber:StockQuote.kt$StockQuote.Companion$10</ID>
+    <ID>MagicNumber:Tell.kt$Tell$50</ID>
+    <ID>MagicNumber:Tell.kt$Tell$7</ID>
+    <ID>MagicNumber:Twitter.kt$Twitter$1000L</ID>
+    <ID>MagicNumber:Twitter.kt$Twitter$60L</ID>
+    <ID>MagicNumber:TwitterOAuth.kt$TwitterOAuth$401</ID>
+    <ID>MagicNumber:Users.kt$Users$8</ID>
+    <ID>MagicNumber:Utils.kt$Utils$30</ID>
+    <ID>MagicNumber:Utils.kt$Utils$365</ID>
+    <ID>MagicNumber:Utils.kt$Utils$7</ID>
+    <ID>MagicNumber:View.kt$View$6</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$1.60934</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$32</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$5</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$9</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime$14</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime$4</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3600</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$60</ID>
+    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$86.4</ID>
     <ID>NestedBlockDepth:Addons.kt$Addons$ fun add(command: AbstractCommand, props: Properties)</ID>
-    <ID>NestedBlockDepth:Calc.kt$Calc$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
-    <ID>NestedBlockDepth:Comment.kt$Comment$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
-    <ID>NestedBlockDepth:CryptoPrices.kt$CryptoPrices$ override fun run(sender: String, cmd: String, args: String, 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.Companion$ @Suppress("MagicNumber") @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>
-    <ID>NestedBlockDepth:EntriesMgr.kt$EntriesMgr$// Daily backup private fun dailyBackup( bot: Mobibot, history: MutableList&lt;String&gt; )</ID>
+    <ID>NestedBlockDepth:Comment.kt$Comment$override fun commandResponse(channel: String, args: String, event: GenericMessageEvent)</ID>
+    <ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
     <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ private fun setTags(tags: List&lt;String?&gt;)</ID>
-    <ID>NestedBlockDepth:GoogleSearch.kt$GoogleSearch$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
-    <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$override fun commandResponse( sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean )</ID>
-    <ID>NestedBlockDepth:Lookup.kt$Lookup$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
-    <ID>NestedBlockDepth:Mobibot.kt$Mobibot$ fun connect()</ID>
-    <ID>NestedBlockDepth:StockQuote.kt$StockQuote$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
+    <ID>NestedBlockDepth:FeedsMgr.kt$FeedsMgr.Companion$ @Throws(IOException::class, FeedException::class) fun loadFeed(entries: Entries, currentFile: String = currentXml): String</ID>
+    <ID>NestedBlockDepth:FeedsMgr.kt$FeedsMgr.Companion$ fun saveFeed(entries: Entries, currentFile: String = currentXml)</ID>
+    <ID>NestedBlockDepth:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
+    <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$override fun commandResponse(channel: String, args: String, event: GenericMessageEvent)</ID>
+    <ID>NestedBlockDepth:Lookup.kt$Lookup$override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent)</ID>
+    <ID>NestedBlockDepth:Posting.kt$Posting$override fun commandResponse(channel: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
-    <ID>NestedBlockDepth:Tell.kt$Tell$ @JvmOverloads fun send(nickname: String, isMessage: Boolean = false)</ID>
-    <ID>NestedBlockDepth:Tell.kt$Tell$// Delete message. private fun deleteMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean)</ID>
-    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ fun save(file: String, messages: List&lt;TellMessage?&gt;?, logger: Logger)</ID>
+    <ID>NestedBlockDepth:Tell.kt$Tell$ fun send(event: GenericUserEvent)</ID>
+    <ID>NestedBlockDepth:Tell.kt$Tell$// Delete message. private fun deleteMessage(channel: String, args: String, event: GenericMessageEvent)</ID>
+    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ fun load(file: String): List&lt;TellMessage&gt;</ID>
+    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ fun save(file: String, messages: List&lt;TellMessage?&gt;?)</ID>
     <ID>NestedBlockDepth:TwitterOAuth.kt$TwitterOAuth$ @Throws(TwitterException::class, IOException::class) @JvmStatic fun main(args: Array&lt;String&gt;)</ID>
-    <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean)</ID>
+    <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
-    <ID>NestedBlockDepth:WorldTime.kt$WorldTime$override fun commandResponse( sender: String, cmd: String, args: String, isPrivate: Boolean )</ID>
-    <ID>ReturnCount:Addons.kt$Addons$ fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
-    <ID>ReturnCount:Addons.kt$Addons$ fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean</ID>
+    <ID>ReturnCount:Addons.kt$Addons$ fun exec(channel: String, cmd: String, args: String, event: GenericMessageEvent): Boolean</ID>
+    <ID>ReturnCount:Addons.kt$Addons$ fun help(channel: String, topic: String, event: GenericMessageEvent): Boolean</ID>
+    <ID>ReturnCount:ExceptionSanitizer.kt$ExceptionSanitizer$ fun ModuleException.sanitize(vararg sanitize: String): ModuleException</ID>
+    <ID>SwallowedException:GoogleSearchTest.kt$GoogleSearchTest$e: ModuleException</ID>
+    <ID>SwallowedException:StockQuoteTest.kt$StockQuoteTest$e: ModuleException</ID>
     <ID>ThrowsCount:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ThrowsCount:StockQuote.kt$StockQuote.Companion$@Throws(ModuleException::class) private fun getJsonResponse(response: String, debugMessage: String): JSONObject</ID>
     <ID>ThrowsCount:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
-    <ID>TooGenericExceptionCaught:CryptoPrices.kt$CryptoPrices$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$e: Exception</ID>
-    <ID>TooGenericExceptionCaught:Mobibot.kt$Mobibot$ex: Exception</ID>
     <ID>TooGenericExceptionCaught:StockQuote.kt$StockQuote.Companion$e: NullPointerException</ID>
     <ID>TooGenericExceptionCaught:Weather2.kt$Weather2.Companion$e: NullPointerException</ID>
-    <ID>TooManyFunctions:Mobibot.kt$Mobibot : PircBot</ID>
     <ID>TooManyFunctions:Tell.kt$Tell : AbstractCommand</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/properties/log4j2.xml b/properties/log4j2.xml
index 2842592..0aa95bf 100644
--- a/properties/log4j2.xml
+++ b/properties/log4j2.xml
@@ -1,16 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="WARN">
+<Configuration status="warn">
     <Appenders>
         <Console name="stderr" target="SYSTEM_ERR">
             <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
         </Console>
+        <Console name="input" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{UNIX_MILLIS} %msg%n"/>
+            <Filters>
+                <ThresholdFilter level="warn" onMatch="DENY" onMismatch="NEUTRAL"/>
+                <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
+            </Filters>
+        </Console>
+        <Console name="output" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{UNIX_MILLIS} >>>%msg%n"/>
+            <Filters>
+                <ThresholdFilter level="warn" onMatch="DENY" onMismatch="NEUTRAL"/>
+                <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY"/>
+            </Filters>
+        </Console>
     </Appenders>
     <Loggers>
-        <Logger name="net.thauvin.erik.mobibot" level="warn" additivity="false">
-            <AppenderRef ref="stderr"/>
-        </Logger>
-        <Root level="error">
+        <Root level="warn" additivity="false">
             <AppenderRef ref="stderr"/>
         </Root>
+        <logger level="debug" name="org.pircbotx.InputParser" additivity="false">
+            <appender-ref ref="input"/>
+            <appender-ref ref="stderr" level="warn"/>
+        </logger>
+        <logger level="debug" name="org.pircbotx.output.OutputRaw" additivity="false">
+            <appender-ref ref="output"/>
+            <appender-ref ref="stderr" level="warn"/>
+        </logger>
+        <logger level="warn" name="net.thauvin.erik.mobibot" additivity="false">
+            <appender-ref ref="stderr"/>
+        </logger>
     </Loggers>
 </Configuration>
diff --git a/properties/mobibot.properties b/properties/mobibot.properties
index 8089d08..67326f3 100644
--- a/properties/mobibot.properties
+++ b/properties/mobibot.properties
@@ -3,9 +3,13 @@ server=irc.freenode.net
 #port=6667
 login=mobibot
 nick=mobibot
+#realname=mobibot
+
+# Die command password, if any
+#die=changeme
 
 # NickServ password
-ident=changepwd
+ident=changeme
 #ident-nick=nickserv
 #ident-msg=IDENTIFY changepwd
 
@@ -14,7 +18,6 @@ ignore=chanserv,nickserv
 tags=mobile mobitopia
 tags-keywords=android ios apple google
 
-weblog=http://www.mobitopia.org/
 feed=http://www.mobitopia.org/rss.xml
 backlogs=http://www.mobitopia.org/mobibot/logs
 
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 2e83533..c286091 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -32,9 +32,9 @@
 
 package net.thauvin.erik.mobibot.modules;
 
-import net.thauvin.erik.mobibot.Mobibot;
 import net.thauvin.erik.mobibot.Utils;
 import org.jetbrains.annotations.NotNull;
+import org.pircbotx.hooks.types.GenericMessageEvent;
 
 import java.security.SecureRandom;
 
@@ -66,8 +66,8 @@ public final class War extends AbstractModule {
     /**
      * The default constructor.
      */
-    public War(final Mobibot bot) {
-        super(bot);
+    public War() {
+        super();
 
         commands.add(WAR_CMD);
 
@@ -79,10 +79,8 @@ public final class War extends AbstractModule {
      * {@inheritDoc}
      */
     @Override
-    public void commandResponse(@NotNull final String sender,
-                                @NotNull final String cmd,
-                                @NotNull final String args,
-                                final boolean isPrivate) {
+    public void commandResponse(@NotNull final String channel, @NotNull final String cmd, @NotNull final String args,
+                                @NotNull final GenericMessageEvent event) {
         int i;
         int y;
 
@@ -90,20 +88,20 @@ public final class War extends AbstractModule {
             i = RANDOM.nextInt(HEARTS.length);
             y = RANDOM.nextInt(HEARTS.length);
 
-            getBot().send(sender + " drew: " + DECK[RANDOM.nextInt(DECK.length)][i]);
-            getBot().action("drew: " + DECK[RANDOM.nextInt(DECK.length)][y]);
+            event.respond("you drew " + DECK[RANDOM.nextInt(DECK.length)][i]);
+            event.getBot().sendIRC().action(channel, "drew " + DECK[RANDOM.nextInt(DECK.length)][y]);
 
             if (i != y) {
                 break;
             }
 
-            getBot().send("This means " + bold("WAR") + '!');
+            event.respond("This means " + bold("WAR") + '!');
         }
 
         if (i < y) {
-            getBot().action("lost.");
+            event.getBot().sendIRC().action(channel, "lost.");
         } else {
-            getBot().action("wins.");
+            event.getBot().sendIRC().action(channel, "wins.");
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
index 1a0e8dd..bc527f0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
@@ -33,6 +33,8 @@ package net.thauvin.erik.mobibot
 
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.modules.AbstractModule
+import org.pircbotx.hooks.events.PrivateMessageEvent
+import org.pircbotx.hooks.types.GenericMessageEvent
 import java.util.Properties
 
 /**
@@ -77,7 +79,7 @@ class Addons {
             if (isEnabled()) {
                 commands.add(this)
                 if (isVisible) {
-                    if (isOp) {
+                    if (isOpOnly) {
                         ops.add(name)
                     } else {
                         names.add(name)
@@ -90,17 +92,18 @@ class Addons {
     /**
      * Execute a command or module.
      */
-    fun exec(sender: String, login: String, cmd: String, args: String, isOp: Boolean, isPrivate: Boolean): Boolean {
-        for (command in commands) {
+    fun exec(channel: String, cmd: String, args: String, event: GenericMessageEvent): Boolean {
+        val cmds = if (event is PrivateMessageEvent) commands else commands.filter { it.isPublic }
+        for (command in cmds) {
             if (command.name.startsWith(cmd)) {
-                command.commandResponse(sender, login, args, isOp, isPrivate)
+                command.commandResponse(channel, args, event)
                 return true
             }
         }
-        val mods = if (isPrivate) modules.filter { it.isPrivateMsgEnabled } else modules
+        val mods = if (event is PrivateMessageEvent) modules.filter { it.isPrivateMsgEnabled } else modules
         for (module in mods) {
             if (module.commands.contains(cmd)) {
-                module.commandResponse(sender, cmd, args, isPrivate)
+                module.commandResponse(channel, cmd, args, event)
                 return true
             }
         }
@@ -110,10 +113,10 @@ class Addons {
     /**
      * Match a command.
      */
-    fun match(sender: String, login: String, message: String, isOp: Boolean, isPrivate: Boolean): Boolean {
+    fun match(channel: String, event: GenericMessageEvent): Boolean {
         for (command in commands) {
-            if (command.matches(message)) {
-                command.commandResponse(sender, login, message, isOp, isPrivate)
+            if (command.matches(event.message)) {
+                command.commandResponse(channel, event.message, event)
                 return true
             }
         }
@@ -123,15 +126,15 @@ class Addons {
     /**
      * Commands and Modules help.
      */
-    fun help(sender: String, topic: String, isOp: Boolean, isPrivate: Boolean): Boolean {
+    fun help(channel: String, topic: String, event: GenericMessageEvent): Boolean {
         for (command in commands) {
             if (command.isVisible && command.name.startsWith(topic)) {
-                return command.helpResponse(topic, sender, isOp, isPrivate)
+                return command.helpResponse(channel, topic, event)
             }
         }
         for (module in modules) {
             if (module.commands.contains(topic)) {
-                return module.helpResponse(sender, isPrivate)
+                return module.helpResponse(event)
             }
         }
         return false
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
index 2ae420d..dfe25dc 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
@@ -45,11 +45,6 @@ object Constants {
      */
     const val DEBUG_ARG = "debug"
 
-    /**
-     * The debug command.
-     */
-    const val DEBUG_CMD = "debug"
-
     /**
      * Default IRC Port.
      */
@@ -58,12 +53,7 @@ object Constants {
     /**
      * Default IRC Server.
      */
-    const val DEFAULT_SERVER = "irc.freenode.net"
-
-    /**
-     * The die command.
-     */
-    const val DIE_CMD = "die"
+    const val DEFAULT_SERVER = "irc.libera.chat"
 
     /**
      * Help command line argument.
@@ -75,11 +65,6 @@ object Constants {
      */
     const val HELP_CMD = "help"
 
-    /**
-     * The kill command.
-     */
-    const val KILL_CMD = "kill"
-
     /**
      * The link command.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index 3ee5aad..16c8e6b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -36,38 +36,36 @@ import com.rometools.rome.io.SyndFeedInput
 import com.rometools.rome.io.XmlReader
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendMessage
+import net.thauvin.erik.mobibot.entries.FeedsMgr
 import net.thauvin.erik.mobibot.msg.Message
-import net.thauvin.erik.mobibot.msg.PublicMessage
+import net.thauvin.erik.mobibot.msg.NoticeMessage
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.net.URL
 
 /**
  * Reads an RSS feed.
  */
-class FeedReader(
-    // Bot
-    private val bot: Mobibot,
-    // Nick of the person who sent the message
-    private val sender: String,
-    // URL to fetch
-    private val url: String
-) : Runnable {
+class FeedReader(private val url: String, val event: GenericMessageEvent) : Runnable {
+    private val logger: Logger = LoggerFactory.getLogger(FeedsMgr::class.java)
+
     /**
      * Fetches the Feed's items.
      */
     override fun run() {
-        with(bot) {
-            try {
-                readFeed(url).forEach {
-                    send(sender, it)
-                }
-            } catch (e: FeedException) {
-                if (logger.isDebugEnabled) logger.debug("Unable to parse the feed at $url", e)
-                send(sender, "An error has occurred while parsing the feed: ${e.message}", false)
-            } catch (e: IOException) {
-                if (logger.isDebugEnabled) logger.debug("Unable to fetch the feed at $url", e)
-                send(sender, "An error has occurred while fetching the feed: ${e.message}", false)
+        try {
+            readFeed(url).forEach {
+                event.sendMessage("", it)
             }
+        } catch (e: FeedException) {
+            if (logger.isWarnEnabled) logger.warn("Unable to parse the feed at $url", e)
+            event.sendMessage("An error has occurred while parsing the feed: ${e.message}")
+        } catch (e: IOException) {
+            if (logger.isWarnEnabled) logger.warn("Unable to fetch the feed at $url", e)
+            event.sendMessage("An error has occurred while fetching the feed: ${e.message}")
         }
     }
 
@@ -81,11 +79,11 @@ class FeedReader(
                 val feed = input.build(reader)
                 val items = feed.entries
                 if (items.isEmpty()) {
-                    messages.add(PublicMessage("There is currently nothing to view."))
+                    messages.add(NoticeMessage("There is currently nothing to view."))
                 } else {
                     items.take(maxItems).forEach {
-                        messages.add(PublicMessage(it.title))
-                        messages.add(PublicMessage(helpFormat(green(it.link), false)))
+                        messages.add(NoticeMessage(it.title))
+                        messages.add(NoticeMessage(helpFormat(green(it.link), false)))
                     }
                 }
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 6bfbe8a..574366a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -29,23 +29,21 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 package net.thauvin.erik.mobibot
 
 import net.thauvin.erik.mobibot.Utils.appendIfMissing
-import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
-import net.thauvin.erik.mobibot.Utils.colorize
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.getIntProperty
-import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.sendList
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
-import net.thauvin.erik.mobibot.Utils.today
-import net.thauvin.erik.mobibot.commands.AddLog
 import net.thauvin.erik.mobibot.commands.ChannelFeed
 import net.thauvin.erik.mobibot.commands.Cycle
-import net.thauvin.erik.mobibot.commands.Debug
 import net.thauvin.erik.mobibot.commands.Die
 import net.thauvin.erik.mobibot.commands.Ignore
 import net.thauvin.erik.mobibot.commands.Info
-import net.thauvin.erik.mobibot.commands.Kill
 import net.thauvin.erik.mobibot.commands.Me
 import net.thauvin.erik.mobibot.commands.Modules
 import net.thauvin.erik.mobibot.commands.Msg
@@ -61,8 +59,6 @@ import net.thauvin.erik.mobibot.commands.links.Posting
 import net.thauvin.erik.mobibot.commands.links.Tags
 import net.thauvin.erik.mobibot.commands.links.View
 import net.thauvin.erik.mobibot.commands.tell.Tell
-import net.thauvin.erik.mobibot.entries.EntriesMgr
-import net.thauvin.erik.mobibot.entries.EntryLink
 import net.thauvin.erik.mobibot.modules.Calc
 import net.thauvin.erik.mobibot.modules.CryptoPrices
 import net.thauvin.erik.mobibot.modules.CurrencyConverter
@@ -73,12 +69,9 @@ import net.thauvin.erik.mobibot.modules.Lookup
 import net.thauvin.erik.mobibot.modules.Ping
 import net.thauvin.erik.mobibot.modules.RockPaperScissors
 import net.thauvin.erik.mobibot.modules.StockQuote
-import net.thauvin.erik.mobibot.modules.Twitter
 import net.thauvin.erik.mobibot.modules.War
 import net.thauvin.erik.mobibot.modules.Weather2
 import net.thauvin.erik.mobibot.modules.WorldTime
-import net.thauvin.erik.mobibot.msg.Message
-import net.thauvin.erik.pinboard.PinboardPoster
 import net.thauvin.erik.semver.Version
 import org.apache.commons.cli.CommandLine
 import org.apache.commons.cli.CommandLineParser
@@ -87,10 +80,19 @@ import org.apache.commons.cli.HelpFormatter
 import org.apache.commons.cli.Option
 import org.apache.commons.cli.Options
 import org.apache.commons.cli.ParseException
-import org.apache.logging.log4j.Level
-import org.apache.logging.log4j.LogManager
-import org.apache.logging.log4j.Logger
-import org.jibble.pircbot.PircBot
+import org.pircbotx.Configuration
+import org.pircbotx.PircBotX
+import org.pircbotx.hooks.ListenerAdapter
+import org.pircbotx.hooks.events.ActionEvent
+import org.pircbotx.hooks.events.DisconnectEvent
+import org.pircbotx.hooks.events.JoinEvent
+import org.pircbotx.hooks.events.MessageEvent
+import org.pircbotx.hooks.events.NickChangeEvent
+import org.pircbotx.hooks.events.PartEvent
+import org.pircbotx.hooks.events.PrivateMessageEvent
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.BufferedOutputStream
 import java.io.File
 import java.io.FileNotFoundException
@@ -100,427 +102,139 @@ import java.io.PrintStream
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.Properties
-import java.util.Timer
-import java.util.logging.ConsoleHandler
 import java.util.regex.Pattern
 import kotlin.system.exitProcess
 
-/**
- * Implements the #mobitopia bot.
- */
 @Version(properties = "version.properties", className = "ReleaseInfo", template = "version.mustache", type = "kt")
-class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Properties) : PircBot() {
+class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Properties) : ListenerAdapter() {
+    // The bot configuration.
+    private val config: Configuration
+
     // Commands and Modules
     private val addons = Addons()
 
+    // Tell module
+    private val tell: Tell
+
     /** Main channel. */
     val channel: String
 
-    // IRC port
-    private val ircPort: Int
-
-    /** IRC server. */
-    val ircServer: String
-
     /** Logger. */
-    val logger: Logger = LogManager.getLogger(Mobibot::class.java)
-
-    /** Logger default level. */
-    val loggerLevel: Level
-
-    /** Log directory. */
-    val logsDir: String
-
-    // Pinboard posts handler
-    private val pinboard: PinboardPoster = PinboardPoster()
-
-    /** Tell command. */
-    val tell: Tell
-
-    /** Today's date. */
-    val today = today()
-
-    /** Twitter module. */
-    val twitter: Twitter
-
-    /** The backlogs URL. */
-    val backlogsUrl: String
-
-    // Ident message
-    private val identMsg: String
-
-    // Ident nick
-    private val identNick: String
-
-    // NickServ ident password
-    private val identPwd: String
-
-    // Is pinboard enabled?
-    private var isPinboardEnabled = false
-
-    /** Timer. */
-    val timer = Timer(true)
-
-    /** Weblog URL */
-    val weblogUrl: String
-
-    /** The current channel name. */
-    private val channelName: String
-        get() = channel.substring(1)
-
-    /** The enabled modules names. */
-    val modulesNames: List<String>
-        get() = addons.modulesNames
-
-    /**
-     * Sends an action to the current channel.
-     */
-    fun action(action: String) {
-        action(channel, action)
-    }
-
-    /**
-     * Sends an action to the channel.
-     */
-    private fun action(channel: String, action: String) {
-        if (channel.isNotBlank() && action.isNotBlank()) {
-            sendAction(channel, action)
-        }
-    }
-
-    /**
-     * Adds pin on pinboard.
-     */
-    fun addPin(entry: EntryLink) {
-        if (isPinboardEnabled) {
-            PinboardUtils.addPin(pinboard, ircServer, entry)
-        }
-    }
+    val logger: Logger = LoggerFactory.getLogger(Mobibot::class.java)
 
     /**
      * Connects to the server and joins the channel.
      */
     fun connect() {
-        try {
-            connect(ircServer, ircPort)
-        } catch (e: Exception) {
-            if (logger.isDebugEnabled) {
-                logger.debug("Unable to connect to $ircServer, will try again.", e)
-            }
-            var retries = 0
-            while (retries++ < MAX_RECONNECT && !isConnected) {
-                @Suppress("MagicNumber")
-                sleep(10)
-                try {
-                    connect(ircServer, ircPort)
-                } catch (ex: Exception) {
-                    if (retries == MAX_RECONNECT) {
-                        if (logger.isDebugEnabled) {
-                            logger.debug("Unable to reconnect to $ircServer, after $MAX_RECONNECT retries.", ex)
-                        }
-                        System.err.println("An error has occurred while reconnecting; ${ex.message}")
-                        exitProcess(1)
-                    }
-                }
-            }
-        }
-        identify()
-        joinChannel()
-    }
-
-    /**
-     * Deletes pin on pinboard.
-     */
-    fun deletePin(index: Int, entry: EntryLink) {
-        if (isPinboardEnabled) {
-            PinboardUtils.deletePin(pinboard, entry)
-        }
-        if (twitter.isAutoPost) {
-            twitter.removeEntry(index)
-        }
+        PircBotX(config).startBot()
     }
 
     /**
      * Responds with the default help.
      */
-    @Suppress("MagicNumber")
-    fun helpDefault(sender: String, isOp: Boolean, isPrivate: Boolean) {
-        send(sender, "Type a URL on $channel to post it.", isPrivate)
-        send(sender, "For more information on a specific command, type:", isPrivate)
-        send(
-            sender,
-            helpFormat(buildCmdSyntax("%c ${Constants.HELP_CMD} <command>", nick, isPrivate)),
-            isPrivate
+    private fun helpDefault(event: GenericMessageEvent) {
+        event.sendMessage("Type a URL on $channel to post it.")
+        event.sendMessage("For more information on a specific command, type:")
+        event.sendMessage(
+            Utils.helpFormat(
+                Utils.buildCmdSyntax(
+                    "%c ${Constants.HELP_CMD} <command>",
+                    event.bot().nick,
+                    event is PrivateMessageEvent
+                )
+            ),
         )
-        send(sender, "The commands are:", isPrivate)
-        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 = isPrivate, isBold = true, isIndent = true)
+        event.sendMessage("The commands are:")
+        event.sendList(addons.names, 8, isBold = true, isIndent = true)
+        if (isChannelOp(channel, event)) {
+            event.sendMessage("The op commands are:")
+            event.sendList(addons.ops, 8, isBold = true, isIndent = true)
         }
     }
 
     /**
      * Responds with the default, commands or modules help.
      */
-    private fun helpResponse(sender: String, topic: String, isPrivate: Boolean) {
-        val isOp = isOp(sender)
-        if (topic.isBlank() || !addons.help(sender, topic.lowercase().trim(), isOp, isPrivate)) {
-            helpDefault(sender, isOp, isPrivate)
+    private fun helpResponse(event: GenericMessageEvent, topic: String) {
+        if (topic.isBlank() || !addons.help(channel, topic.lowercase().trim(), event)) {
+            helpDefault(event)
         }
     }
 
-    /**
-     * Identifies the bot.
-     */
-    private fun identify() {
-        // Identify with NickServ
-        if (identPwd.isNotBlank()) {
-            identify(identPwd)
-        }
-        // Identify with a specified nick
-        if (identNick.isNotBlank() && identMsg.isNotBlank()) {
-            sendMessage(identNick, identMsg)
+    override fun onAction(event: ActionEvent?) {
+        if (channel == event?.channel?.name) {
+            storeRecap(event.user!!.nick, event.action, true)
         }
     }
 
-    /**
-     * Returns {@code true} if the specified sender is an Op on the [channel][.ircChannel].
-     */
-    fun isOp(sender: String): Boolean {
-        for (user in getUsers(channel)) {
-            if (user.nick == sender) {
-                return user.isOp
+    override fun onDisconnect(event: DisconnectEvent?) {
+        with(event!!.getBot<PircBotX>()) {
+            LinksMgr.twitter.notification("$nick disconnected from irc://$serverHostname")
+        }
+        LinksMgr.twitter.shutdown()
+    }
+
+    override fun onPrivateMessage(event: PrivateMessageEvent?) {
+        if (logger.isTraceEnabled) logger.trace("<<< ${event!!.user!!.nick}: ${event.message}")
+        val cmds = event!!.message.trim().split(" ".toRegex(), 2)
+        val cmd = cmds[0].lowercase()
+        val args = if (cmds.size > 1) {
+            cmds[1].trim()
+        } else ""
+        if (cmd.startsWith(Constants.HELP_CMD)) { // help
+            helpResponse(event, args)
+        } else if (!addons.exec(channel, cmd, args, event)) { // Execute command or module
+            helpDefault(event)
+        }
+    }
+
+    override fun onJoin(event: JoinEvent?) {
+        with(event!!.getBot<PircBotX>()) {
+            if (event.user!!.nick == nick) {
+                LinksMgr.twitter.notification("$nick has joined ${event.channel.name} on irc://$serverHostname")
+            } else {
+                tell.send(event)
             }
         }
-        return false
     }
 
-    /**
-     * Joins the bot's channel.
-     */
-    private fun joinChannel() {
-        joinChannel(channel)
-        twitter.notification("$name ${ReleaseInfo.VERSION} has joined $channel")
-    }
-
-    override fun onDisconnect() {
-        if (weblogUrl.isNotBlank()) {
-            version = weblogUrl
-        }
-        @Suppress("MagicNumber")
-        sleep(5)
-        connect()
-    }
-
-    override fun onMessage(
-        channel: String,
-        sender: String,
-        login: String,
-        hostname: String,
-        message: String
-    ) {
-        if (logger.isDebugEnabled) logger.debug(">>> $sender: $message")
-        tell.send(sender, true)
-        if (message.matches("(?i)${Pattern.quote(nick)}:.*".toRegex())) { // mobibot: <command>
+    override fun onMessage(event: MessageEvent?) {
+        val sender = event!!.user!!.nick
+        val message = event.message
+        tell.send(event)
+        if (message.matches("(?i)${Pattern.quote(event.bot().nick)}:.*".toRegex())) { // mobibot: <command>
+            if (logger.isTraceEnabled) logger.trace(">>> $sender: $message")
             val cmds = message.substring(message.indexOf(':') + 1).trim().split(" ".toRegex(), 2)
             val cmd = cmds[0].lowercase()
             val args = if (cmds.size > 1) {
                 cmds[1].trim()
             } else ""
             if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
-                helpResponse(sender, args, false)
+                helpResponse(event, args)
             } else {
                 // Execute module or command
-                addons.exec(sender, login, cmd, args, isOp(sender), false)
+                addons.exec(channel, cmd, args, event)
             }
-        } else {
-            // Links, e.g.: https://www.example.com/ or L1: , etc.
-            addons.match(sender, login, message, isOp(sender), false)
+        } else if (addons.match(channel, event)) { // Links, e.g.: https://www.example.com/ or L1: , etc.
+            if (logger.isTraceEnabled) logger.trace(">>> $sender: $message")
         }
         storeRecap(sender, message, false)
     }
 
-    override fun onPrivateMessage(
-        sender: String,
-        login: String,
-        hostname: String,
-        message: String
-    ) {
-        if (logger.isDebugEnabled) logger.debug(">>> $sender : $message")
-        val cmds = message.trim().split(" ".toRegex(), 2)
-        val cmd = cmds[0].lowercase()
-        val args = if (cmds.size > 1) {
-            cmds[1].trim()
-        } else ""
-        val isOp = isOp(sender)
-        if (cmd.startsWith(Constants.HELP_CMD)) { // help
-            helpResponse(sender, args, true)
-        } else if (isOp && Constants.KILL_CMD == cmd) { // kill
-            twitter.notification("$name killed by $sender on $channel")
-            sendRawLine("QUIT :Poof!")
-            exitProcess(0)
-        } else if (isOp && Constants.DIE_CMD == cmd) { // die
-            send("$sender has just signed my death sentence.")
-            timer.cancel()
-            twitter.shutdown()
-            twitter.notification("$name stopped by $sender on $channel")
-            @Suppress("MagicNumber")
-            sleep(3)
-            quitServer("The Bot Is Out There!")
-            exitProcess(0)
-        } else if (!addons.exec(sender, login, cmd, args, isOp, true)) { // Execute command or module
-            helpDefault(sender, isOp, true)
-        }
+    override fun onNickChange(event: NickChangeEvent?) {
+        tell.send(event!!)
     }
 
-    override fun onAction(sender: String, login: String, hostname: String, target: String, action: String) {
-        if (channel == target) {
-            storeRecap(sender, action, true)
-        }
-    }
-
-    override fun onJoin(channel: String, sender: String, login: String, hostname: String) {
-        tell.send(sender)
-    }
-
-    override fun onNickChange(oldNick: String, login: String, hostname: String, newNick: String) {
-        tell.send(newNick)
-    }
-
-    /**
-     * Sends a private message or notice.
-     */
-    fun send(sender: String, message: String?, isPrivate: Boolean) {
-        if (message != null && sender.isNotBlank()) {
-            if (isPrivate) {
-                if (logger.isDebugEnabled) logger.debug("Sending message to $sender : $message")
-                sendMessage(sender, message)
-            } else {
-                if (logger.isDebugEnabled) logger.debug("Sending notice to $sender: $message")
-                sendNotice(sender, message)
+    override fun onPart(event: PartEvent?) {
+        with(event!!.getBot<PircBotX>()) {
+            if (event.user!!.nick == nick) {
+                LinksMgr.twitter.notification("$nick has left ${event.channel.name} on irc://$serverHostname")
             }
         }
     }
 
-    /**
-     * Sends a notice to the channel.
-     */
-    fun send(notice: String?) {
-        notice?.let { send(channel, it, false) }
-    }
-
-    /**
-     * Sends a message.
-     */
-    fun send(who: String, message: Message) {
-        send(if (message.isNotice) who else channel, message.msg, message.color, message.isPrivate)
-    }
-
-    /**
-     * Sends a message.
-     */
-    fun send(who: String, message: String, color: String, isPrivate: Boolean) {
-        send(who, colorize(message, color), isPrivate)
-    }
-
-    /**
-     * Send a formatted commands/modules, etc. list.
-     */
-    @JvmOverloads
-    fun sendList(
-        nick: String,
-        list: List<String>,
-        maxPerLine: Int,
-        separator: String = " ",
-        isPrivate: Boolean,
-        isBold: Boolean = false,
-        isIndent: Boolean = false
-    ) {
-        var i = 0
-        while (i < list.size) {
-            send(
-                nick,
-                helpFormat(
-                    list.subList(i, list.size.coerceAtMost(i + maxPerLine)).joinToString(separator, truncated = ""),
-                    isBold,
-                    isIndent
-                ),
-                isPrivate
-            )
-            i += maxPerLine
-        }
-    }
-
-    /**
-     * Sets the pinboard authentication.
-     */
-    private fun setPinboardAuth(apiToken: String) {
-        if (apiToken.isNotBlank()) {
-            pinboard.apiToken = apiToken
-            isPinboardEnabled = true
-            if (logger.isDebugEnabled) {
-                val consoleHandler = ConsoleHandler()
-                consoleHandler.level = java.util.logging.Level.FINE
-                pinboard.logger.addHandler(consoleHandler)
-                pinboard.logger.level = java.util.logging.Level.FINE
-            }
-        }
-    }
-
-    /**
-     * Shutdown the bot.
-     */
-    fun shutdown(sender: String, now: Boolean = false) {
-        if (now) { // kill
-            twitter.notification("$name killed by $sender on $channel")
-            sendRawLine("QUIT :Poof!")
-        } else {
-            timer.cancel()
-            twitter.shutdown()
-            twitter.notification("$name stopped by $sender on $channel")
-            @Suppress("MagicNumber")
-            sleep(3)
-            quitServer("The Bot Is Out There!")
-        }
-        exitProcess(0)
-    }
-
-    /**
-     * Sleeps for the specified number of seconds.
-     */
-    fun sleep(secs: Int) {
-        try {
-            @Suppress("MagicNumber")
-            Thread.sleep(secs * 1000L)
-        } catch (ignore: InterruptedException) {
-            // Do nothing
-        }
-    }
-
-    /**
-     * Updates pin on pinboard.
-     */
-    fun updatePin(oldUrl: String, entry: EntryLink) {
-        if (isPinboardEnabled) {
-            PinboardUtils.updatePin(pinboard, ircServer, oldUrl, entry)
-        }
-    }
-
-    /**
-     * Returns the bot's version.
-     */
-    override fun onVersion(sourceNick: String, sourceLogin: String, sourceHostname: String, target: String) {
-        sendRawLine("NOTICE $sourceNick :\u0001VERSION ${ReleaseInfo.PROJECT} ${ReleaseInfo.VERSION}\u0001")
-    }
-
     companion object {
-        // Maximum number of times the bot will try to reconnect, if disconnected
-        private const val MAX_RECONNECT = 10
-
-        /**
-         * The Truth is Out There!
-         */
+        @Throws(Exception::class)
         @JvmStatic
         fun main(args: Array<String>) {
             // Set up the command line options
@@ -593,7 +307,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                             val stdout = PrintStream(
                                 BufferedOutputStream(
                                     FileOutputStream(
-                                        logsDir + channel.substring(1) + '.' + today() + ".log", true
+                                        logsDir + channel.substring(1) + '.' + Utils.today() + ".log", true
                                     )
                                 ), true
                             )
@@ -615,11 +329,8 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                         }
                     }
 
-                    // Create the bot
-                    val bot = Mobibot(nickname, channel, logsDir, p)
-
-                    // Connect
-                    bot.connect()
+                    // Start the bot
+                    Mobibot(nickname, channel, logsDir, p).connect()
                 }
             }
         }
@@ -629,97 +340,93 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      * Initialize the bot.
      */
     init {
-        System.getProperties().setProperty("sun.net.client.defaultConnectTimeout", Constants.CONNECT_TIMEOUT.toString())
-        System.getProperties().setProperty("sun.net.client.defaultReadTimeout", Constants.CONNECT_TIMEOUT.toString())
-
-        name = nickname
-        ircServer = p.getProperty("server", Constants.DEFAULT_SERVER)
-        ircPort = p.getIntProperty("port", Constants.DEFAULT_PORT)
         this.channel = channel
-        logsDir = logsDirPath
+        val ircServer = p.getProperty("server", Constants.DEFAULT_SERVER)
+        config = Configuration.Builder().apply {
+            name = nickname
+            login = p.getProperty("login", nickname)
+            realName = p.getProperty("realname", nickname)
+            addServer(
+                ircServer,
+                p.getIntProperty("port", Constants.DEFAULT_PORT)
+            )
+            addAutoJoinChannel(channel)
+            addListener(this@Mobibot)
+            version = "${ReleaseInfo.PROJECT} ${ReleaseInfo.VERSION}"
+            isAutoNickChange = true
+            val identPwd = p.getProperty("ident")
+            if (!identPwd.isNullOrBlank()) {
+                nickservPassword = identPwd
+            }
+            val identNick = p.getProperty("ident-nick")
+            if (!identNick.isNullOrBlank()) {
+                nickservNick = identNick
+            }
+            val identMsg = p.getProperty("ident-msg")
+            if (!identMsg.isNullOrBlank()) {
+                nickservCustomMessage = identMsg
+            }
+            isAutoReconnect = true
+            //socketConnectTimeout = Constants.CONNECT_TIMEOUT
+            //socketTimeout = Constants.CONNECT_TIMEOUT
+            //messageDelay = StaticDelay(500)
+        }.buildConfiguration()
 
-        // Store the default logger level
-        loggerLevel = logger.level
+        // Load the current entries
+        with(LinksMgr) {
+            entries.channel = channel
+            entries.ircServer = ircServer
+            entries.logsDir = logsDirPath
+            entries.backlogs = p.getProperty("backlogs", "")
+            entries.load()
 
-        setVerbose(true)
-        setAutoNickChange(true)
-        login = p.getProperty("login", name)
-        // Set the real name
-        version = ReleaseInfo.PROJECT
-        // setMessageDelay(1000);
-
-        // Set NICKSERV identification
-        identPwd = p.getProperty("ident", "")
-        identNick = p.getProperty("ident-nick", "")
-        identMsg = p.getProperty("ident-msg", "")
-
-        // Set the URLs
-        weblogUrl = p.getProperty("weblog", "")
-        backlogsUrl = p.getProperty("backlogs", weblogUrl).appendIfMissing('/')
-
-        // Load the current entries and backlogs, if any
-        try {
-            LinksMgr.startup(logsDir + EntriesMgr.CURRENT_XML, logsDir + EntriesMgr.NAV_XML, this.channel)
-            if (logger.isDebugEnabled) logger.debug("Last feed: ${LinksMgr.startDate}")
-        } catch (e: Exception) {
-            if (logger.isErrorEnabled) logger.error("An error occurred while loading the logs.", e)
+            // Set up pinboard
+            pinboard.setApiToken(p.getProperty("pinboard-api-token", ""))
         }
 
-        // Set the pinboard authentication
-        setPinboardAuth(p.getProperty("pinboard-api-token", ""))
-
         // Load the commands
-        addons.add(AddLog(this), p)
-        addons.add(ChannelFeed(this, channelName), p)
-        addons.add(Cycle(this), p)
-        addons.add(Die(this), p)
-        addons.add(Debug(this), p)
-        addons.add(Ignore(this), p)
-        addons.add(Info(this), p)
-        addons.add(Kill(this), p)
-        addons.add(Me(this), p)
-        addons.add(Modules(this), p)
-        addons.add(Msg(this), p)
-        addons.add(Nick(this), p)
-        addons.add(Recap(this), p)
-        addons.add(Say(this), p)
-        addons.add(Users(this), p)
-        addons.add(Versions(this), p)
+        addons.add(ChannelFeed(channel.removePrefix("#")), p)
+        addons.add(Comment(), p)
+        addons.add(Cycle(), p)
+        addons.add(Die(), p)
+        addons.add(Ignore(), p)
+        addons.add(LinksMgr(), p)
+        addons.add(Me(), p)
+        addons.add(Msg(), p)
+        addons.add(Nick(), p)
+        addons.add(Posting(), p)
+        addons.add(Recap(), p)
+        addons.add(Say(), p)
+        addons.add(Tags(), p)
 
         // Tell command
-        tell = Tell(this)
+        tell = Tell("${logsDirPath}${nickname}.ser")
         addons.add(tell, p)
 
-        // Load the links commands
-        addons.add(Comment(this), p)
-        addons.add(Posting(this), p)
-        addons.add(Tags(this), p)
-        addons.add(LinksMgr(this), p)
-        addons.add(View(this), p)
+        addons.add(LinksMgr.twitter, p)
+        addons.add(Users(), p)
+        addons.add(Versions(), p)
+        addons.add(View(), p)
 
         // Load the modules
-        addons.add(Calc(this), p)
-        addons.add(CryptoPrices(this), p)
-        addons.add(CurrencyConverter(this), p)
-        addons.add(Dice(this), p)
-        addons.add(GoogleSearch(this), p)
-        addons.add(Joke(this), p)
-        addons.add(Lookup(this), p)
-        addons.add(Ping(this), p)
-        addons.add(RockPaperScissors(this), p)
-        addons.add(StockQuote(this), p)
-        addons.add(War(this), p)
-        addons.add(Weather2(this), p)
-        addons.add(WorldTime(this), p)
-
-        // Twitter module
-        twitter = Twitter(this)
-        addons.add(twitter, p)
+        addons.add(Calc(), p)
+        addons.add(CryptoPrices(), p)
+        addons.add(CurrencyConverter(), p)
+        addons.add(Dice(), p)
+        addons.add(GoogleSearch(), p)
+        addons.add(Info(tell), p)
+        addons.add(Joke(), p)
+        addons.add(Lookup(), p)
+        addons.add(Modules(addons.modulesNames), p)
+        addons.add(Ping(), p)
+        addons.add(RockPaperScissors(), p)
+        addons.add(StockQuote(), p)
+        addons.add(Weather2(), p)
+        addons.add(WorldTime(), p)
+        addons.add(War(), p)
 
         // Sort the addons
         addons.sort()
-
-        // Save the entries
-        LinksMgr.saveEntries(this, true)
     }
 }
+
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt
similarity index 63%
rename from src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt
index 2d91b64..8083c74 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/PinboardUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt
@@ -1,5 +1,5 @@
 /*
- * PinboardUtils.kt
+ * Pinboard.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -45,33 +45,44 @@ import java.util.Date
 /**
  * Handles posts to pinboard.in.
  */
-object PinboardUtils {
+class Pinboard {
+    private val poster = PinboardPoster()
+
     /**
      * Adds a pin.
      */
-    @JvmStatic
-    fun addPin(poster: PinboardPoster, ircServer: String, entry: EntryLink) {
-        runBlocking {
-            launch {
-                poster.addPin(
-                    entry.link,
-                    entry.title,
-                    entry.postedBy(ircServer),
-                    entry.pinboardTags,
-                    entry.date.toTimestamp()
-                )
+    fun addPin(ircServer: String, entry: EntryLink) {
+        if (poster.apiToken.isNotBlank()) {
+            runBlocking {
+                launch {
+                    poster.addPin(
+                        entry.link,
+                        entry.title,
+                        entry.postedBy(ircServer),
+                        entry.pinboardTags,
+                        entry.date.toTimestamp()
+                    )
+                }
             }
         }
     }
 
+    /**
+     * Sets the pinboard API token.
+     */
+    fun setApiToken(apiToken: String) {
+        poster.apiToken = apiToken
+    }
+
     /**
      * Deletes a pin.
      */
-    @JvmStatic
-    fun deletePin(poster: PinboardPoster, entry: EntryLink) {
-        runBlocking {
-            launch {
-                poster.deletePin(entry.link)
+    fun deletePin(entry: EntryLink) {
+        if (poster.apiToken.isNotBlank()) {
+            runBlocking {
+                launch {
+                    poster.deletePin(entry.link)
+                }
             }
         }
     }
@@ -79,30 +90,15 @@ object PinboardUtils {
     /**
      * Updates a pin.
      */
-    @JvmStatic
-    fun updatePin(poster: PinboardPoster, ircServer: String, oldUrl: String, entry: EntryLink) {
-        runBlocking {
-            launch {
-                with(entry) {
-                    if (oldUrl != link) {
-                        poster.deletePin(oldUrl)
-                        poster.addPin(
-                            link,
-                            title,
-                            entry.postedBy(ircServer),
-                            pinboardTags,
-                            date.toTimestamp()
-                        )
-                    } else {
-                        poster.addPin(
-                            link,
-                            title,
-                            entry.postedBy(ircServer),
-                            pinboardTags,
-                            date.toTimestamp(),
-                            replace = true,
-                            shared = true
-                        )
+    fun updatePin(ircServer: String, oldUrl: String, entry: EntryLink) {
+        if (poster.apiToken.isNotBlank()) {
+            runBlocking {
+                launch {
+                    with(entry) {
+                        if (oldUrl != link) {
+                            poster.deletePin(oldUrl)
+                        }
+                        poster.addPin(link, title, entry.postedBy(ircServer), pinboardTags, date.toTimestamp())
                     }
                 }
             }
@@ -112,8 +108,7 @@ object PinboardUtils {
     /**
      * Format a date to a UTC timestamp.
      */
-    @JvmStatic
-    fun Date.toTimestamp(): String {
+    private fun Date.toTimestamp(): String {
         return ZonedDateTime.ofInstant(
             this.toInstant().truncatedTo(ChronoUnit.SECONDS),
             ZoneId.systemDefault()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
index 31bde39..a96b491 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
@@ -95,7 +95,6 @@ object TwitterOAuth {
                                 """.trimIndent()
                             )
                         } catch (te: TwitterException) {
-                            @Suppress("MagicNumber")
                             if (401 == te.statusCode) {
                                 println("Unable to get the access token.")
                             } else {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
index 6b3a4b3..374f301 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
@@ -32,10 +32,11 @@
 
 package net.thauvin.erik.mobibot
 
+import net.thauvin.erik.mobibot.modules.Twitter
 import java.util.TimerTask
 
-class TwitterTimer(var bot: Mobibot, private var index: Int) : TimerTask() {
+class TwitterTimer(private var twitter: Twitter, private var index: Int) : TimerTask() {
     override fun run() {
-        bot.twitter.postEntry(index)
+        twitter.postEntry(index)
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index a16c01b..6f75788 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -31,9 +31,13 @@
  */
 package net.thauvin.erik.mobibot
 
+import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.Message.Companion.DEFAULT_COLOR
-import org.jibble.pircbot.Colors
 import org.jsoup.Jsoup
+import org.pircbotx.Colors
+import org.pircbotx.PircBotX
+import org.pircbotx.hooks.events.PrivateMessageEvent
+import org.pircbotx.hooks.types.GenericMessageEvent
 import java.io.BufferedReader
 import java.io.IOException
 import java.io.InputStreamReader
@@ -85,6 +89,13 @@ object Utils {
     @JvmStatic
     fun bold(s: String?): String = colorize(s, Colors.BOLD)
 
+    /**
+     * Returns the [PircBotX] instance.
+     */
+    fun GenericMessageEvent.bot(): PircBotX {
+        return getBot() as PircBotX
+    }
+
     /**
      * Build a help command by replacing `%c` with the bot's pub/priv command, and `%n` with the bot's
      * nick.
@@ -159,6 +170,14 @@ object Utils {
         return if (isIndent) s.prependIndent() else s
     }
 
+    /**
+     * Returns {@code true} if the specified user is an operator on the [channel].
+     */
+    @JvmStatic
+    fun isChannelOp(channel: String, event: GenericMessageEvent): Boolean {
+        return event.bot().userChannelDao.getChannel(channel).isOp(event.user)
+    }
+
     /**
      * Obfuscates the given string.
      */
@@ -203,6 +222,56 @@ object Utils {
     @JvmStatic
     fun reverseColor(s: String?): String = colorize(s, Colors.REVERSE)
 
+    /**
+     * Send a formatted commands/modules, etc. list.
+     */
+    @JvmStatic
+    fun GenericMessageEvent.sendList(
+        list: List<String>,
+        maxPerLine: Int,
+        separator: String = " ",
+        isBold: Boolean = false,
+        isIndent: Boolean = false
+    ) {
+        var i = 0
+        while (i < list.size) {
+            sendMessage(
+                helpFormat(
+                    list.subList(i, list.size.coerceAtMost(i + maxPerLine)).joinToString(separator, truncated = ""),
+                    isBold,
+                    isIndent
+                ),
+            )
+            i += maxPerLine
+        }
+    }
+
+    /**
+     * Sends a [message].
+     */
+    @JvmStatic
+    fun GenericMessageEvent.sendMessage(channel: String, message: Message) {
+        if (message.isNotice) {
+            bot().sendIRC().notice(user.nick, colorize(message.msg, message.color))
+        } else if (message.isPrivate || this is PrivateMessageEvent || channel.isBlank()) {
+            respondPrivateMessage(colorize(message.msg, message.color))
+        } else {
+            bot().sendIRC().message(channel, colorize(message.msg, message.color))
+        }
+    }
+
+    /**
+     * Sends a response as a private message or notice.
+     */
+    @JvmStatic
+    fun GenericMessageEvent.sendMessage(message: String) {
+        if (this is PrivateMessageEvent) {
+            respondPrivateMessage(message)
+        } else {
+            bot().sendIRC().notice(user.nick, message)
+        }
+    }
+
     /**
      * Returns today's date.
      */
@@ -258,7 +327,6 @@ object Utils {
     /**
      * Converts milliseconds to year month week day hour and minutes.
      */
-    @Suppress("MagicNumber")
     @JvmStatic
     fun uptime(uptime: Long): String {
         val info = StringBuilder()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 7675fe5..425f309 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -32,31 +32,31 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.sendMessage
+import org.pircbotx.hooks.events.PrivateMessageEvent
+import org.pircbotx.hooks.types.GenericMessageEvent
 import java.util.concurrent.ConcurrentHashMap
 
-abstract class AbstractCommand(val bot: Mobibot) {
+abstract class AbstractCommand {
     abstract val name: String
     abstract val help: List<String>
-    abstract val isOp: Boolean
+    abstract val isOpOnly: Boolean
     abstract val isPublic: Boolean
     abstract val isVisible: Boolean
 
     val properties: MutableMap<String, String> = ConcurrentHashMap()
 
-    abstract fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    )
+    abstract fun commandResponse(channel: String, args: String, event: GenericMessageEvent)
 
-    open fun helpResponse(command: String, sender: String, isOp: Boolean, isPrivate: Boolean): Boolean {
-        if (!this.isOp || this.isOp == isOp) {
+    open fun helpResponse(channel: String, topic: String, event: GenericMessageEvent): Boolean {
+        if (!isOpOnly || isOpOnly == isChannelOp(channel, event)) {
             for (h in help) {
-                bot.send(sender, buildCmdSyntax(h, bot.nick, isPrivate), isPrivate)
+                event.sendMessage(
+                    buildCmdSyntax(h, event.bot().nick, event is PrivateMessageEvent || !isPublic),
+                )
             }
             return true
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
deleted file mode 100644
index f13aa4d..0000000
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AddLog.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * AddLog.kt
- *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands
-
-import net.thauvin.erik.mobibot.Mobibot
-
-import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.history
-import net.thauvin.erik.mobibot.entries.EntriesMgr
-import java.io.File
-
-class AddLog(bot: Mobibot) : AbstractCommand(bot) {
-    override val name = "addlog"
-    override val help = emptyList<String>()
-    override val isOp = true
-    override val isPublic = false
-    override val isVisible = false
-
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (isOp) {
-            if (args.isNotBlank()) {
-                // e.g: 2014-04-01
-                val backlog = File("${bot.logsDir}$args${EntriesMgr.XML_EXT}")
-                if (backlog.exists()) {
-                    history.add(0, args)
-                } else {
-                    bot.send(sender, "The specified log could not be found.", isPrivate)
-                    return
-                }
-            }
-            @Suppress("MagicNumber")
-            bot.sendList(sender, history, 4, isPrivate = isPrivate, isIndent = true)
-        }
-    }
-}
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index 8dbe942..5ac8d7f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -35,13 +35,14 @@ package net.thauvin.erik.mobibot.commands
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import net.thauvin.erik.mobibot.FeedReader
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendMessage
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
+class ChannelFeed(channel: String) : AbstractCommand() {
     override val name = channel
     override val help = listOf("To list the last 5 posts from the channel's weblog feed:", helpFormat("%c $channel"))
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = true
     override val isVisible = true
 
@@ -53,22 +54,16 @@ class ChannelFeed(bot: Mobibot, channel: String) : AbstractCommand(bot) {
         initProperties(FEED_PROP)
     }
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         with(properties[FEED_PROP]) {
             if (!isNullOrBlank()) {
                 runBlocking {
                     launch {
-                        FeedReader(bot, sender, this@with).run()
+                        FeedReader(this@with, event).run()
                     }
                 }
             } else {
-                bot.send(sender, "There is no feed setup for this channel.", false)
+                event.sendMessage("There is no feed setup for this channel.")
             }
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
index 88de89b..e5b019d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -32,35 +32,33 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Cycle(bot: Mobibot) : AbstractCommand(bot) {
-    @Suppress("MagicNumber")
+class Cycle : AbstractCommand() {
     private val wait = 10
     override val name = "cycle"
     override val help = listOf("To have the bot leave the channel and come back:", helpFormat("%c $name"))
-    override val isOp = true
+    override val isOpOnly = true
     override val isPublic = false
     override val isVisible = true
 
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        with(bot) {
-            if (isOp) {
-                send("$sender has just asked me to leave. I'll be back!")
-                sleep(wait)
-                partChannel(channel)
-                sleep(wait)
-                joinChannel(channel)
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        with(event.bot()) {
+            if (isChannelOp(channel, event)) {
+                runBlocking {
+                    sendIRC().message(channel, "${event.user.nick} asked me to leave. I'll be back!")
+                    userChannelDao.getChannel(channel).send().part()
+                    delay(wait * 1000L)
+                    sendIRC().joinChannel(channel)
+                }
             } else {
-                helpDefault(sender, isOp, isPrivate)
+                helpResponse(channel, args, event)
             }
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Debug.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Debug.kt
deleted file mode 100644
index 8c3c97b..0000000
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Debug.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Debug.kt
- *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package net.thauvin.erik.mobibot.commands
-
-import net.thauvin.erik.mobibot.Constants
-import net.thauvin.erik.mobibot.Mobibot
-import org.apache.logging.log4j.Level
-import org.apache.logging.log4j.core.config.Configurator
-
-class Debug(bot: Mobibot) : AbstractCommand(bot) {
-    override val name = Constants.DEBUG_CMD
-    override val help = emptyList<String>()
-    override val isOp = true
-    override val isPublic = false
-    override val isVisible = false
-
-    override fun commandResponse(sender: String, login: String, args: String, isOp: Boolean, isPrivate: Boolean) {
-        if (isOp) {
-            with(bot) {
-                if (logger.isDebugEnabled) {
-                    Configurator.setLevel(logger.name, loggerLevel)
-                } else {
-                    Configurator.setLevel(logger.name, Level.DEBUG)
-                }
-                send(sender, "Debug logging is " + if (logger.isDebugEnabled) "enabled." else "disabled.", true)
-            }
-        }
-    }
-}
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
index c9c6299..df715c4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
@@ -32,25 +32,35 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Die(bot: Mobibot) : AbstractCommand(bot) {
+class Die : AbstractCommand() {
     override val name = "die"
     override val help = emptyList<String>()
-    override val isOp = true
+    override val isOpOnly = true
     override val isPublic = false
     override val isVisible = false
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (isOp) {
-            bot.send("$sender has just signed my death sentence.")
-            bot.shutdown(sender)
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        with(event.bot()) {
+            if (isChannelOp(channel, event) && (properties[DIE_PROP].isNullOrBlank() || args == properties[DIE_PROP])) {
+                sendIRC().message(channel, "${event.user?.nick} has just signed my death sentence.")
+                stopBotReconnect()
+                sendIRC().quitServer("The Bot is Out There!")
+            }
         }
     }
+
+    companion object {
+        /**
+         * Max days property.
+         */
+        const val DIE_PROP = "die"
+    }
+
+    init {
+        initProperties(DIE_PROP)
+    }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
index 7ae45a2..d1e38ce 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -32,13 +32,17 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.sendList
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.commands.links.LinksMgr
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Ignore(bot: Mobibot) : AbstractCommand(bot) {
+class Ignore : AbstractCommand() {
     private val me = "me"
 
     init {
@@ -58,7 +62,7 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
         arrayOf("To add/remove nicks from the ignored list:", helpFormat("%c $name <nick> [<nick> ...]"))
     )
 
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = true
     override val isVisible = true
 
@@ -73,56 +77,45 @@ class Ignore(bot: Mobibot) : AbstractCommand(bot) {
         }
     }
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         val isMe = args.trim().equals(me, true)
-        if (isMe || !isOp) {
-            val nick = sender.lowercase()
-            ignoreNick(bot, nick, isMe, isPrivate)
+        if (isMe || !isChannelOp(channel, event)) {
+            val nick = event.user.nick.lowercase()
+            ignoreNick(nick, isMe, event)
         } else {
-            ignoreOp(bot, sender, args, isPrivate)
+            ignoreOp(args, event)
         }
     }
 
-    override fun helpResponse(
-        command: String,
-        sender: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ): Boolean {
-        return if (isOp) {
+    override fun helpResponse(channel: String, topic: String, event: GenericMessageEvent): Boolean {
+        return if (isChannelOp(channel, event)) {
             for (h in helpOp) {
-                bot.send(sender, buildCmdSyntax(h, bot.nick, isPrivate), isPrivate)
+                event.sendMessage(buildCmdSyntax(h, event.bot().nick, true))
             }
             true
         } else {
-            super.helpResponse(command, sender, isOp, isPrivate)
+            super.helpResponse(channel, topic, event)
         }
     }
 
-    private fun ignoreNick(bot: Mobibot, sender: String, isMe: Boolean, isPrivate: Boolean) {
+    private fun ignoreNick(sender: String, isMe: Boolean, event: GenericMessageEvent) {
         if (isMe) {
             if (ignored.remove(sender)) {
-                bot.send(sender, "You are no longer ignored.", isPrivate)
+                event.sendMessage("You are no longer ignored.")
             } else {
                 ignored.add(sender)
-                bot.send(sender, "You are now ignored.", isPrivate)
+                event.sendMessage("You are now ignored.")
             }
         } else {
             if (ignored.contains(sender)) {
-                bot.send(sender, "You are currently ignored.", isPrivate)
+                event.sendMessage("You are currently ignored.")
             } else {
-                bot.send(sender, "You are not currently ignored.", isPrivate)
+                event.sendMessage("You are not currently ignored.")
             }
         }
     }
 
-    private fun ignoreOp(bot: Mobibot, sender: String, args: String, isPrivate: Boolean) {
+    private fun ignoreOp(args: String, event: GenericMessageEvent) {
         if (args.isNotEmpty()) {
             val nicks = args.lowercase().split(" ")
             for (nick in nicks) {
@@ -138,11 +131,10 @@ 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 = isPrivate, isIndent = true)
+            event.sendMessage("The following nicks are ignored:")
+            event.sendList(ignored.sorted(), 8, isIndent = true)
         } else {
-            bot.send(sender, "No one is currently ${bold("ignored")}.", isPrivate)
+            event.sendMessage("No one is currently ${bold("ignored")}.")
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
index bffd1f2..a383756 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
@@ -31,50 +31,46 @@
  */
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.ReleaseInfo
 import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.sendList
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.uptime
 import net.thauvin.erik.mobibot.commands.links.LinksMgr
+import net.thauvin.erik.mobibot.commands.tell.Tell
+import org.pircbotx.hooks.types.GenericMessageEvent
 import java.lang.management.ManagementFactory
 
-class Info(bot: Mobibot?) : AbstractCommand(bot!!) {
+class Info(private val tell: Tell) : AbstractCommand() {
     private val allVersions = listOf(
         "${ReleaseInfo.PROJECT.capitalise()} ${ReleaseInfo.VERSION} (${green(ReleaseInfo.WEBSITE)})",
         "Written by ${ReleaseInfo.AUTHOR} (${green(ReleaseInfo.AUTHOR_URL)})"
     )
     override val name = "info"
     override val help = listOf("To view information about the bot:", helpFormat("%c $name"))
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = true
     override val isVisible = true
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        with(bot) {
-            sendList(sender, allVersions, 1, isPrivate = isPrivate)
-            val info = StringBuilder()
-            info.append("Uptime: ")
-                .append(uptime(ManagementFactory.getRuntimeMXBean().uptime))
-                .append(" [Entries: ")
-                .append(LinksMgr.entries.size)
-            if (isOp) {
-                if (tell.isEnabled()) {
-                    info.append(", Messages: ").append(tell.size())
-                }
-                if (twitter.isAutoPost) {
-                    info.append(", Twitter: ").append(twitter.entriesCount())
-                }
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        event.sendList(allVersions, 1)
+        val info = StringBuilder()
+        info.append("Uptime: ")
+            .append(uptime(ManagementFactory.getRuntimeMXBean().uptime))
+            .append(" [Entries: ")
+            .append(LinksMgr.entries.links.size)
+        if (isChannelOp(channel, event)) {
+            if (tell.isEnabled()) {
+                info.append(", Messages: ").append(tell.size())
+            }
+            if (LinksMgr.twitter.isAutoPost) {
+                info.append(", Twitter: ").append(LinksMgr.twitter.entriesCount())
             }
-            info.append(", Recap: ").append(Recap.recaps.size).append(']')
-            send(sender, info.toString(), isPrivate)
         }
+        info.append(", Recap: ").append(Recap.recaps.size).append(']')
+        event.sendMessage(info.toString())
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
index 4b996f1..7a85f4f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
@@ -32,27 +32,21 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Me(bot: Mobibot) : AbstractCommand(bot) {
+class Me : AbstractCommand() {
     override val name = "me"
     override val help = listOf("To have the bot perform an action:", helpFormat("%c $name <action>"))
-    override val isOp = true
+    override val isOpOnly = true
     override val isPublic = false
     override val isVisible = true
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (isOp) {
-            bot.action(args)
-        } else {
-            bot.helpDefault(sender, isOp, isPrivate)
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        if (isChannelOp(channel, event)) {
+            event.bot().sendIRC().action(channel, args)
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
index 3bd2db1..36a4baf 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -32,35 +32,29 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.sendList
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Modules(bot: Mobibot) : AbstractCommand(bot) {
+class Modules(private val modulesNames: List<String>) : AbstractCommand() {
     override val name = "modules"
     override val help = listOf("To view a list of enabled modules:", helpFormat("%c $name"))
-    override val isOp = true
+    override val isOpOnly = true
     override val isPublic = false
     override val isVisible = true
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        with(bot) {
-            if (isOp) {
-                if (modulesNames.isEmpty()) {
-                    send(sender, "There are no enabled modules.", isPrivate)
-                } else {
-                    send(sender, "The enabled modules are: ", isPrivate)
-                    @Suppress("MagicNumber")
-                    sendList(sender, modulesNames, 7, isPrivate = isPrivate, isIndent = true)
-                }
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        if (isChannelOp(channel, event)) {
+            if (modulesNames.isEmpty()) {
+                event.respondPrivateMessage("There are no enabled modules.")
             } else {
-                helpDefault(sender, isOp, isPrivate)
+                event.respondPrivateMessage("The enabled modules are: ")
+                event.sendList(modulesNames, 7, isIndent = true)
             }
+        } else {
+            helpResponse(channel, args, event)
         }
     }
 }
+
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
index 5e9b5ae..edd9cc9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -32,35 +32,30 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Msg(bot: Mobibot) : AbstractCommand(bot) {
+class Msg : AbstractCommand() {
     override val name = "msg"
     override val help = listOf(
         "To have the bot send a private message to someone:",
         helpFormat("%c $name <nick> <text>")
     )
-    override val isOp = true
-    override val isPublic = true
+    override val isOpOnly = true
+    override val isPublic = false
     override val isVisible = true
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (isOp) {
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        if (isChannelOp(channel, event)) {
             val msg = args.split(" ", limit = 2)
             if (args.length > 2) {
-                bot.send(msg[0], msg[1], isPrivate)
+                event.bot().sendIRC().message(msg[0], msg[1])
+                event.respondPrivateMessage("A message was sent to ${msg[0]}")
             } else {
-                helpResponse(name, sender, isOp, isPrivate)
+                helpResponse(channel, args, event)
             }
-        } else {
-            bot.helpDefault(sender, isOp, isPrivate)
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
index 2f956e2..c8275dd 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -32,27 +32,21 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Nick(bot: Mobibot) : AbstractCommand(bot) {
+class Nick : AbstractCommand() {
     override val name = "nick"
     override val help = listOf("To change the bot's nickname:", helpFormat("%c $name <new_nick>"))
-    override val isOp = true
+    override val isOpOnly = true
     override val isPublic = true
     override val isVisible = true
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (isOp) {
-            bot.changeNick(args)
-        } else {
-            bot.helpDefault(sender, isOp, isPrivate)
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        if (isChannelOp(channel, event)) {
+            event.bot().sendIRC().changeNick(args)
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
index 5912ff4..03b349c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -32,19 +32,20 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.toUtcDateTime
+import org.pircbotx.hooks.types.GenericMessageEvent
 import java.time.Clock
 import java.time.LocalDateTime
 
-class Recap(bot: Mobibot) : AbstractCommand(bot) {
+class Recap : AbstractCommand() {
     override val name = "recap"
     override val help = listOf(
         "To list the last 10 public channel messages:",
         helpFormat("%c $name")
     )
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = true
     override val isVisible = true
 
@@ -61,26 +62,19 @@ class Recap(bot: Mobibot) : AbstractCommand(bot) {
                 LocalDateTime.now(Clock.systemUTC()).toUtcDateTime()
                         + " - $sender" + (if (isAction) " " else ": ") + message
             )
-            @Suppress("MagicNumber")
             if (recaps.size > 10) {
                 recaps.removeFirst()
             }
         }
     }
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         if (recaps.isNotEmpty()) {
             for (r in recaps) {
-                bot.send(sender, r, isPrivate)
+                event.sendMessage(r)
             }
         } else {
-            bot.send(sender, "Sorry, nothing to recap.", isPrivate)
+            event.sendMessage("Sorry, nothing to recap.")
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
index 198ea8c..a89c64e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
@@ -32,28 +32,22 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Say(bot: Mobibot) : AbstractCommand(bot) {
+class Say : AbstractCommand() {
     override val name = "say"
     override val help = listOf("To have the bot say something on the channel:", helpFormat("%c $name <text>"))
-    override val isOp = true
+    override val isOpOnly = true
     override val isPublic = false
     override val isVisible = true
 
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (isOp) {
-            bot.send(args)
-        } else {
-            bot.helpDefault(sender, isOp, isPrivate)
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        if (isChannelOp(channel, event)) {
+            event.bot().sendIRC().message(channel, args)
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
index 82f5277..5133146 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
@@ -32,36 +32,29 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendList
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Users(bot: Mobibot) : AbstractCommand(bot) {
+class Users : AbstractCommand() {
     override val name = "users"
     override val help = listOf("To list the users present on the channel:", helpFormat("%c $name"))
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = true
     override val isVisible = true
 
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         val nicks = mutableListOf<String>()
-        with(bot) {
-            getUsers(channel).forEach { user ->
-                if (isOp(user.nick)) {
-                    nicks.add("@${user.nick}")
-                } else {
-                    nicks.add(user.nick)
-                }
+        val ch = event.bot().userChannelDao.getChannel(channel)
+        ch.users.forEach {
+            if (it.channelsOpIn.contains(ch)) {
+                nicks.add("@${it.nick}")
+            } else {
+                nicks.add(it.nick)
             }
-
-            @Suppress("MagicNumber")
-            sendList(sender, nicks.sorted(), 8, isPrivate = isPrivate, isIndent = true)
         }
+        event.sendList(nicks, 8)
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
index 1712add..f7fa866 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
@@ -31,12 +31,14 @@
  */
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.ReleaseInfo
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.sendList
 import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Versions(bot: Mobibot) : AbstractCommand(bot) {
+class Versions : AbstractCommand() {
     private val allVersions = listOf(
         "Version:  ${ReleaseInfo.VERSION} (${ReleaseInfo.BUILDDATE.toIsoLocalDate()})",
         "Platform: " + System.getProperty("os.name") + ' ' + System.getProperty("os.version")
@@ -45,21 +47,13 @@ class Versions(bot: Mobibot) : AbstractCommand(bot) {
     )
     override val name = "versions"
     override val help = listOf("To view the versions data (bot, platform, java, etc.):", helpFormat("%c $name"))
-    override val isOp = true
+    override val isOpOnly = true
     override val isPublic = false
     override val isVisible = true
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (isOp) {
-            bot.sendList(sender, allVersions, 1, isPrivate = isPrivate)
-        } else {
-            bot.helpDefault(sender, false, isPrivate)
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        if (isChannelOp(channel, event)) {
+            event.sendList(allVersions, 1)
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 2bfc57b..61143fb 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -33,14 +33,16 @@
 package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Constants
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Comment(bot: Mobibot) : AbstractCommand(bot) {
+class Comment : AbstractCommand() {
     override val name = COMMAND
     override val help = listOf(
         "To add a comment:",
@@ -51,7 +53,7 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
         "To delete a comment, use its label and a minus sign: ",
         helpFormat("${Constants.LINK_CMD}1.1:-")
     )
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = true
     override val isVisible = true
 
@@ -59,29 +61,22 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
         const val COMMAND = "comment"
     }
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        @Suppress("MagicNumber")
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         val cmds = args.substring(1).split("[.:]".toRegex(), 3)
-        val index = cmds[0].toInt() - 1
+        val entryIndex = cmds[0].toInt() - 1
 
-        if (index < LinksMgr.entries.size) {
-            val entry: EntryLink = LinksMgr.entries[index]
+        if (entryIndex < LinksMgr.entries.links.size && LinksMgr.isUpToDate(event)) {
+            val entry: EntryLink = LinksMgr.entries.links[entryIndex]
             val commentIndex = cmds[1].toInt() - 1
             if (commentIndex < entry.comments.size) {
                 when (val cmd = cmds[2].trim()) {
-                    "" -> showComment(bot, entry, index, commentIndex) // L1.1:
-                    "-" -> deleteComment(bot, sender, isOp, entry, index, commentIndex) // L11:-
+                    "" -> showComment(entry, entryIndex, commentIndex, event) // L1.1:
+                    "-" -> deleteComment(channel, entry, entryIndex, commentIndex, event) // L1.1:-
                     else -> {
                         if (cmd.startsWith('?')) {  // L1.1:?<author>
-                            changeAuthor(bot, cmd, sender, isOp, entry, index, commentIndex)
+                            changeAuthor(channel, cmd, entry, entryIndex, commentIndex, event)
                         } else { // L1.1:<comment>
-                            setComment(bot, cmd, sender, entry, index, commentIndex)
+                            setComment(cmd, entry, entryIndex, commentIndex, event)
                         }
                     }
                 }
@@ -89,20 +84,11 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
         }
     }
 
-    override fun helpResponse(
-        command: String,
-        sender: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ): Boolean {
-        if (super.helpResponse(command, sender, isOp, isPrivate)) {
-            if (isOp) {
-                bot.send(sender, "To change a comment's author:", isPrivate)
-                bot.send(
-                    sender,
-                    helpFormat("${Constants.LINK_CMD}1.1:?<nick>"),
-                    isPrivate
-                )
+    override fun helpResponse(channel: String, topic: String, event: GenericMessageEvent): Boolean {
+        if (super.helpResponse(channel, topic, event)) {
+            if (isChannelOp(channel, event)) {
+                event.sendMessage("To change a comment's author:")
+                event.sendMessage(helpFormat("${Constants.LINK_CMD}1.1:?<nick>"))
             }
             return true
         }
@@ -114,49 +100,52 @@ class Comment(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     private fun changeAuthor(
-        bot: Mobibot,
+        channel: String,
         cmd: String,
-        sender: String,
-        isOp: Boolean,
         entry: EntryLink,
-        index: Int,
-        commentIndex: Int
+        entryIndex: Int,
+        commentIndex: Int,
+        event: GenericMessageEvent
     ) {
-        if (isOp && cmd.length > 1) {
+        if (isChannelOp(channel, event) && cmd.length > 1) {
             val comment = entry.getComment(commentIndex)
             comment.nick = cmd.substring(1)
-            bot.send(EntriesUtils.buildComment(index, commentIndex, comment))
-            LinksMgr.saveEntries(bot, false)
+            event.sendMessage(EntriesUtils.buildComment(entryIndex, commentIndex, comment))
+            LinksMgr.entries.save()
         } else {
-            bot.send(sender, "Please ask a channel op to change the author of this comment for you.", false)
+            event.sendMessage("Please ask a channel op to change the author of this comment for you.")
         }
     }
 
     private fun deleteComment(
-        bot: Mobibot,
-        sender: String,
-        isOp: Boolean,
+        channel: String,
         entry: EntryLink,
-        index: Int,
-        commentIndex: Int
+        entryIndex: Int,
+        commentIndex: Int,
+        event: GenericMessageEvent
     ) {
-        if (isOp || sender == entry.getComment(commentIndex).nick) {
+        if (isChannelOp(channel, event) || event.user.nick == entry.getComment(commentIndex).nick) {
             entry.deleteComment(commentIndex)
-            bot.send("Comment ${EntriesUtils.buildLinkCmd(index)}.${commentIndex + 1} removed.")
-            LinksMgr.saveEntries(bot, false)
+            event.sendMessage("Comment ${EntriesUtils.buildLinkLabel(entryIndex)}.${commentIndex + 1} removed.")
+            LinksMgr.entries.save()
         } else {
-            bot.send(sender, "Please ask a channel op to delete this comment for you.", false)
+            event.sendMessage("Please ask a channel op to delete this comment for you.")
         }
     }
 
-    private fun setComment(bot: Mobibot, cmd: String, sender: String, entry: EntryLink, index: Int, commentIndex: Int) {
-        entry.setComment(commentIndex, cmd, sender)
-        val comment = entry.getComment(commentIndex)
-        bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment), false)
-        LinksMgr.saveEntries(bot, false)
+    private fun setComment(
+        cmd: String,
+        entry: EntryLink,
+        entryIndex: Int,
+        commentIndex: Int,
+        event: GenericMessageEvent
+    ) {
+        entry.setComment(commentIndex, cmd, event.user.nick)
+        event.sendMessage(EntriesUtils.buildComment(entryIndex, commentIndex, entry.getComment(commentIndex)))
+        LinksMgr.entries.save()
     }
 
-    private fun showComment(bot: Mobibot, entry: EntryLink, index: Int, commentIndex: Int) {
-        bot.send(EntriesUtils.buildComment(index, commentIndex, entry.getComment(commentIndex)))
+    private fun showComment(entry: EntryLink, entryIndex: Int, commentIndex: Int, event: GenericMessageEvent) {
+        event.sendMessage(EntriesUtils.buildComment(entryIndex, commentIndex, entry.getComment(commentIndex)))
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index fd7eb27..7bd95b8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -33,25 +33,29 @@
 package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Constants
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Pinboard
 import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.commands.AbstractCommand
-import net.thauvin.erik.mobibot.commands.Ignore
-import net.thauvin.erik.mobibot.entries.EntriesMgr
+import net.thauvin.erik.mobibot.commands.Ignore.Companion.isNotIgnored
+import net.thauvin.erik.mobibot.entries.Entries
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
+import net.thauvin.erik.mobibot.modules.Twitter
 import org.jsoup.Jsoup
+import org.pircbotx.hooks.types.GenericMessageEvent
 import java.io.IOException
 
-class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
-    private val keywords: MutableList<String> = mutableListOf()
+class LinksMgr : AbstractCommand() {
     private val defaultTags: MutableList<String> = mutableListOf()
+    private val keywords: MutableList<String> = mutableListOf()
 
     override val name = Constants.LINK_CMD
     override val help = emptyList<String>()
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = false
     override val isVisible = false
 
@@ -65,52 +69,35 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         const val TAGS_PROP = "tags"
         const val TAG_MATCH = ", *| +"
 
-        // Entries array
-        @JvmField
-        val entries = mutableListOf<EntryLink>()
+        /** Entries array **/
+        val entries = Entries()
 
-        // History/backlogs array
-        @JvmField
-        val history = mutableListOf<String>()
+        /** Pinboard handler. **/
+        val pinboard = Pinboard()
 
+        /** Twitter handler. **/
+        val twitter = Twitter()
+
+        /** Let the user know if the entries are too old to be modified. **/
         @JvmStatic
-        var startDate: String = today()
-            private set
-
-        /**
-         * Saves the entries.
-         *
-         * @param isDayBackup Set the `true` if the daily backup file should also be created.
-         */
-        @JvmStatic
-        fun saveEntries(bot: Mobibot, isDayBackup: Boolean) {
-            EntriesMgr.saveEntries(bot, entries, history, isDayBackup)
-        }
-
-        @JvmStatic
-        fun startup(current: String, backlogs: String, channel: String) {
-            startDate = EntriesMgr.loadEntries(current, channel, entries)
-            if (today() != startDate) {
-                entries.clear()
-                startDate = today()
+        fun isUpToDate(event: GenericMessageEvent): Boolean {
+            if (entries.lastPubDate != today()) {
+                event.sendMessage("The links are too old to be updated.")
+                return false
             }
-            EntriesMgr.loadBacklogs(backlogs, history)
+            return true
         }
     }
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         val cmds = args.split(" ".toRegex(), 2)
+        val sender = event.user.nick
+        val botNick = event.bot().nick
+        val login = event.user.login
 
-        if (Ignore.isNotIgnored(sender) && (cmds.size == 1 || !cmds[1].contains(bot.nick))) {
+        if (isNotIgnored(sender) && (cmds.size == 1 || !cmds[1].contains(botNick))) {
             val link = cmds[0].trim()
-            if (!isDupEntry(bot, sender, link, isPrivate)) {
-                val isBackup = saveDayBackup(bot)
+            if (!isDupEntry(link, event)) {
                 var title = ""
                 val tags = ArrayList<String>(defaultTags)
                 if (cmds.size == 2) {
@@ -129,37 +116,32 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
                     matchTagKeywords(title, tags)
                 }
 
-                entries.add(EntryLink(link, title, sender, login, bot.channel, tags))
-                val index: Int = entries.size - 1
-                val entry: EntryLink = entries[index]
-                bot.send(EntriesUtils.buildLink(index, entry))
+                // Links are old, clear them
+                if (entries.lastPubDate != today()) {
+                    entries.links.clear()
+                }
 
-                // Add Entry to pinboard.
-                bot.addPin(entry)
+                val entry = EntryLink(link, title, sender, login, channel, tags)
+                entries.links.add(entry)
+                val index = entries.links.lastIndexOf(entry)
+                event.sendMessage(EntriesUtils.buildLink(index, entry))
+
+                pinboard.addPin(event.bot().serverHostname, entry)
 
                 // Queue link for posting to Twitter.
-                bot.twitter.queueEntry(index)
+                twitter.queueEntry(index)
 
-                saveEntries(bot, isBackup)
+                entries.save()
 
                 if (Constants.NO_TITLE == entry.title) {
-                    bot.send(sender, "Please specify a title, by typing:", isPrivate)
-                    bot.send(
-                        sender,
-                        helpFormat("${EntriesUtils.buildLinkCmd(index)}:|This is the title"),
-                        isPrivate
-                    )
+                    event.sendMessage("Please specify a title, by typing:")
+                    event.sendMessage(helpFormat("${EntriesUtils.buildLinkLabel(index)}:|This is the title"))
                 }
             }
         }
     }
 
-    override fun helpResponse(
-        command: String,
-        sender: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ): Boolean = false
+    override fun helpResponse(channel: String, topic: String, event: GenericMessageEvent): Boolean = false
 
     override fun matches(message: String): Boolean {
         return message.matches(LINK_MATCH.toRegex())
@@ -180,12 +162,12 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         return Constants.NO_TITLE
     }
 
-    private fun isDupEntry(bot: Mobibot, sender: String, link: String, isPrivate: Boolean): Boolean {
+    private fun isDupEntry(link: String, event: GenericMessageEvent): Boolean {
         synchronized(entries) {
-            for (i in entries.indices) {
-                if (link == entries[i].link) {
-                    val entry: EntryLink = entries[i]
-                    bot.send(sender, bold("Duplicate") + " >> " + EntriesUtils.buildLink(i, entry), isPrivate)
+            for (i in entries.links.indices) {
+                if (link == entries.links[i].link) {
+                    val entry: EntryLink = entries.links[i]
+                    event.sendMessage(bold("Duplicate") + " >> " + EntriesUtils.buildLink(i, entry))
                     return true
                 }
             }
@@ -202,17 +184,6 @@ class LinksMgr(bot: Mobibot) : AbstractCommand(bot) {
         }
     }
 
-    private fun saveDayBackup(bot: Mobibot): Boolean {
-        if (today() != startDate) {
-            saveEntries(bot, true)
-            entries.clear()
-            startDate = today()
-            return true
-        }
-
-        return false
-    }
-
     override fun setProperty(key: String, value: String) {
         super.setProperty(key, value)
         if (KEYWORDS_PROP == key) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 140f70c..2e7d9ec 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -33,15 +33,18 @@
 package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Constants
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entries
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Posting(bot: Mobibot) : AbstractCommand(bot) {
+class Posting : AbstractCommand() {
     override val name = "posting"
     override val help = listOf(
         "Post a URL, by saying it on a line on its own:",
@@ -55,30 +58,27 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
         "To edit a comment, see: ",
         helpFormat("%c ${Constants.HELP_CMD} ${Comment.COMMAND}")
     )
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = true
     override val isVisible = true
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         val cmds = args.substring(1).split(":", limit = 2)
-        val index = cmds[0].toInt() - 1
+        val entryIndex = cmds[0].toInt() - 1
 
-        if (index < entries.size) {
-            when (val cmd = cmds[1].trim()) {
-                "" -> showEntry(index)
-                "-" -> removeEntry(sender, login, isOp, index) // L1:-
-                else -> {
+        if (entryIndex < entries.links.size) {
+            val cmd = cmds[1].trim()
+            if (cmd.isBlank()) {
+                showEntry(entryIndex, event) // L1:
+            } else if (LinksMgr.isUpToDate(event)) {
+                if (cmd == "-") {
+                    removeEntry(channel, entryIndex, event) // L1:-
+                } else {
                     when (cmd[0]) {
-                        '|' -> changeTitle(cmd, index) // L1:|<title>
-                        '=' -> changeUrl(cmd, login, isOp, index) // L1:=<url>
-                        '?' -> changeAuthor(cmd, sender, isOp, index) // L1:?<author>
-                        else -> addComment(cmd, sender, index) // L1:<comment>
+                        '|' -> changeTitle(cmd, entryIndex, event) // L1:|<title>
+                        '=' -> changeUrl(channel, cmd, entryIndex, event) // L1:=<url>
+                        '?' -> changeAuthor(channel, cmd, entryIndex, event) // L1:?<author>
+                        else -> addComment(cmd, entryIndex, event) // L1:<comment>
                     }
                 }
             }
@@ -89,73 +89,75 @@ class Posting(bot: Mobibot) : AbstractCommand(bot) {
         return message.matches("${Constants.LINK_CMD}[0-9]+:.*".toRegex())
     }
 
-    private fun addComment(cmd: String, sender: String, index: Int) {
-        val entry: EntryLink = entries[index]
-        val commentIndex = entry.addComment(cmd, sender)
+    private fun addComment(cmd: String, entryIndex: Int, event: GenericMessageEvent) {
+        val entry: EntryLink = entries.links[entryIndex]
+        val commentIndex = entry.addComment(cmd, event.user.nick)
         val comment = entry.getComment(commentIndex)
-        bot.send(sender, EntriesUtils.buildComment(index, commentIndex, comment), false)
-        LinksMgr.saveEntries(bot, false)
+        event.sendMessage(EntriesUtils.buildComment(entryIndex, commentIndex, comment))
+        entries.save()
     }
 
-    private fun changeTitle(cmd: String, index: Int) {
+    private fun changeTitle(cmd: String, entryIndex: Int, event: GenericMessageEvent) {
         if (cmd.length > 1) {
-            val entry: EntryLink = entries[index]
+            val entry: EntryLink = entries.links[entryIndex]
             entry.title = cmd.substring(1).trim()
-            bot.updatePin(entry.link, entry)
-            bot.send(EntriesUtils.buildLink(index, entry))
-            LinksMgr.saveEntries(bot, false)
+            LinksMgr.pinboard.updatePin(event.bot().serverHostname, entry.link, entry)
+            event.sendMessage(EntriesUtils.buildLink(entryIndex, entry))
+            entries.save()
         }
     }
 
-    private fun changeUrl(cmd: String, login: String, isOp: Boolean, index: Int) {
-        val entry: EntryLink = entries[index]
-        if (entry.login == login || isOp) {
+    private fun changeUrl(channel: String, cmd: String, entryIndex: Int, event: GenericMessageEvent) {
+        val entry: EntryLink = entries.links[entryIndex]
+        if (entry.login == event.user.login || isChannelOp(channel, event)) {
             val link = cmd.substring(1)
             if (link.matches(LinksMgr.LINK_MATCH.toRegex())) {
                 val oldLink = entry.link
                 entry.link = link
-                bot.updatePin(oldLink, entry)
-                bot.send(EntriesUtils.buildLink(index, entry))
-                LinksMgr.saveEntries(bot, false)
+                LinksMgr.pinboard.updatePin(event.bot().serverHostname, oldLink, entry)
+                event.sendMessage(EntriesUtils.buildLink(entryIndex, entry))
+                entries.save()
             }
         }
     }
 
-    private fun changeAuthor(cmd: String, sender: String, isOp: Boolean, index: Int) {
-        if (isOp) {
+    private fun changeAuthor(channel: String, cmd: String, index: Int, event: GenericMessageEvent) {
+        if (isChannelOp(channel, event)) {
             if (cmd.length > 1) {
-                val entry: EntryLink = entries[index]
+                val entry: EntryLink = entries.links[index]
                 entry.nick = cmd.substring(1)
-                bot.send(EntriesUtils.buildLink(index, entry))
-                LinksMgr.saveEntries(bot, false)
+                LinksMgr.pinboard.updatePin(event.bot().serverHostname, entry.link, entry)
+                event.sendMessage(EntriesUtils.buildLink(index, entry))
+                entries.save()
             }
         } else {
-            bot.send(sender, "Please ask a channel op to change the author of this link for you.", false)
+            event.sendMessage("Please ask a channel op to change the author of this link for you.")
         }
     }
 
-    private fun removeEntry(sender: String, login: String, isOp: Boolean, index: Int) {
-        val entry: EntryLink = entries[index]
-        if (entry.login == login || isOp) {
-            bot.deletePin(index, entry)
-            entries.removeAt(index)
-            bot.send("Entry ${EntriesUtils.buildLinkCmd(index)} removed.")
-            LinksMgr.saveEntries(bot, false)
+    private fun removeEntry(channel: String, index: Int, event: GenericMessageEvent) {
+        val entry: EntryLink = entries.links[index]
+        if (entry.login == event.user.login || isChannelOp(channel, event)) {
+            LinksMgr.pinboard.deletePin(entry)
+            LinksMgr.twitter.removeEntry(index)
+            entries.links.removeAt(index)
+            event.sendMessage("Entry ${EntriesUtils.buildLinkLabel(index)} removed.")
+            entries.save()
         } else {
-            bot.send(sender, "Please ask a channel op to remove this entry for you.", false)
+            event.sendMessage("Please ask a channel op to remove this entry for you.")
         }
     }
 
-    private fun showEntry(index: Int) {
-        val entry: EntryLink = entries[index]
-        bot.send(EntriesUtils.buildLink(index, entry))
+    private fun showEntry(index: Int, event: GenericMessageEvent) {
+        val entry: EntryLink = entries.links[index]
+        event.sendMessage(EntriesUtils.buildLink(index, entry))
         if (entry.tags.isNotEmpty()) {
-            bot.send(EntriesUtils.buildTags(index, entry))
+            event.sendMessage(EntriesUtils.buildTags(index, entry))
         }
         if (entry.comments.isNotEmpty()) {
             val comments = entry.comments
             for (i in comments.indices) {
-                bot.send(EntriesUtils.buildComment(index, i, comments[i]))
+                event.sendMessage(EntriesUtils.buildComment(index, i, comments[i]))
             }
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
index ab7a983..2970033 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -33,19 +33,22 @@
 package net.thauvin.erik.mobibot.commands.links
 
 import net.thauvin.erik.mobibot.Constants
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Tags(bot: Mobibot) : AbstractCommand(bot) {
+class Tags : AbstractCommand() {
     override val name = COMMAND
     override val help = listOf(
         "To categorize or tag a URL, use its label and a ${Constants.TAG_CMD}:",
         helpFormat("${Constants.LINK_CMD}1${Constants.TAG_CMD}:<+tag|-tag> [...]")
     )
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = true
     override val isVisible = true
 
@@ -53,33 +56,27 @@ class Tags(bot: Mobibot) : AbstractCommand(bot) {
         const val COMMAND = "tags"
     }
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         val cmds = args.substring(1).split("${Constants.TAG_CMD}:", limit = 2)
         val index = cmds[0].toInt() - 1
 
-        if (index < LinksMgr.entries.size) {
+        if (index < LinksMgr.entries.links.size && LinksMgr.isUpToDate(event)) {
             val cmd = cmds[1].trim()
-            val entry: EntryLink = LinksMgr.entries[index]
+            val entry: EntryLink = LinksMgr.entries.links[index]
             if (cmd.isNotEmpty()) {
-                if (entry.login == login || isOp) {
+                if (entry.login == event.user.login || isChannelOp(channel, event)) {
                     entry.setTags(cmd)
-                    bot.updatePin(entry.link, entry)
-                    bot.send(EntriesUtils.buildTags(index, entry))
-                    LinksMgr.saveEntries(bot, false)
+                    LinksMgr.pinboard.updatePin(event.bot().serverHostname, entry.link, entry)
+                    event.sendMessage(EntriesUtils.buildTags(index, entry))
+                    LinksMgr.entries.save()
                 } else {
-                    bot.send(sender, "Please ask a channel op to change the tags for you.", isPrivate)
+                    event.sendMessage("Please ask a channel op to change the tags for you.")
                 }
             } else {
                 if (entry.tags.isNotEmpty()) {
-                    bot.send(EntriesUtils.buildTags(index, entry))
+                    event.sendMessage(EntriesUtils.buildTags(index, entry))
                 } else {
-                    bot.send(sender, "The entry has no tags. Why don't add some?", isPrivate)
+                    event.sendMessage("The entry has no tags. Why don't add some?")
                 }
             }
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
index e845a66..5d446d2 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -32,23 +32,25 @@
 
 package net.thauvin.erik.mobibot.commands.links
 
-import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.bot
+import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entries
 import net.thauvin.erik.mobibot.entries.EntriesUtils
 import net.thauvin.erik.mobibot.entries.EntryLink
+import org.pircbotx.hooks.events.PrivateMessageEvent
+import org.pircbotx.hooks.types.GenericMessageEvent
 
-class View(bot: Mobibot) : AbstractCommand(bot) {
-    @Suppress("MagicNumber")
-    private val maxEntries = 8
+class View : AbstractCommand() {
+    private val maxEntries = 6
     override val name = VIEW_CMD
     override val help = listOf(
         "To list or search the current URL posts:",
         helpFormat("%c $name [<start>] [<query>]")
     )
-    override val isOp = false
+    override val isOpOnly = false
     override val isPublic = true
     override val isVisible = true
 
@@ -56,22 +58,16 @@ class View(bot: Mobibot) : AbstractCommand(bot) {
         const val VIEW_CMD = "view"
     }
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (entries.size != 0) {
-            showPosts(bot, args, sender)
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
+        if (entries.links.isNotEmpty()) {
+            showPosts(args, event)
         } else {
-            bot.send(sender, "There is currently nothing to view. Why don't you post something?", isPrivate)
+            event.sendMessage("There is currently nothing to view. Why don't you post something?")
         }
     }
 
-    private fun showPosts(bot: Mobibot, args: String, sender: String) {
-        val max = entries.size
+    private fun showPosts(args: String, event: GenericMessageEvent) {
+        val max = entries.links.size
         var lcArgs = args.lowercase()
         var i = 0
         if (lcArgs.isEmpty() && max > maxEntries) {
@@ -97,25 +93,32 @@ class View(bot: Mobibot) : AbstractCommand(bot) {
         var entry: EntryLink
         var sent = 0
         while (i < max && sent < maxEntries) {
-            entry = entries[i]
+            entry = entries.links[i]
             if (lcArgs.isNotBlank()) {
                 if (entry.matches(lcArgs)) {
-                    bot.send(sender, EntriesUtils.buildLink(i, entry, true), false)
+                    event.sendMessage(EntriesUtils.buildLink(i, entry, true))
                     sent++
                 }
             } else {
-                bot.send(sender, EntriesUtils.buildLink(i, entry, true), false)
+                event.sendMessage(EntriesUtils.buildLink(i, entry, true))
                 sent++
             }
             i++
             if (sent == maxEntries && i < max) {
-                bot.send(
-                    sender, "To view more, try: " + bold("${bot.nick}: $name ${i + 1} $lcArgs"), false
+                event.sendMessage("To view more, try: ")
+                event.sendMessage(
+                    helpFormat(
+                        buildCmdSyntax(
+                            "%c $name ${i + 1} $lcArgs",
+                            event.bot().nick,
+                            event is PrivateMessageEvent
+                        )
+                    )
                 )
             }
         }
         if (sent == 0) {
-            bot.send(sender, "No matches. Please try again.", false)
+            event.sendMessage("No matches. Please try again.")
         }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index ddacd50..b063549 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -31,84 +31,88 @@
  */
 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.helpFormat
+import net.thauvin.erik.mobibot.Utils.isChannelOp
 import net.thauvin.erik.mobibot.Utils.plural
 import net.thauvin.erik.mobibot.Utils.reverseColor
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.toIntOrDefault
 import net.thauvin.erik.mobibot.Utils.toUtcDateTime
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.View
+import org.pircbotx.PircBotX
+import org.pircbotx.hooks.events.MessageEvent
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.pircbotx.hooks.types.GenericUserEvent
 
 /**
  * The `Tell` command.
  */
-class Tell(bot: Mobibot) : AbstractCommand(bot) {
+class Tell(private val serialObject: String) : AbstractCommand() {
     // Messages queue
     private val messages: MutableList<TellMessage> = mutableListOf()
 
-    // Serialized object file
-    private val serializedObject: String
-
     // Maximum number of days to keep messages
-    @Suppress("MagicNumber")
     private var maxDays = 7
 
     // Message maximum queue size
-    @Suppress("MagicNumber")
     private var maxSize = 50
 
     /**
      * Cleans the messages queue.
      */
     private fun clean(): Boolean {
-        if (bot.logger.isDebugEnabled) bot.logger.debug("Cleaning the messages.")
+        // if (bot.logger.isDebugEnabled) bot.logger.debug("Cleaning the messages.")
         return TellMessagesMgr.clean(messages, maxDays.toLong())
     }
 
     // Delete message.
-    private fun deleteMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean) {
+    private fun deleteMessage(channel: String, args: String, event: GenericMessageEvent) {
         val split = args.split(" ")
         if (split.size == 2) {
             val id = split[1]
             var deleted = false
             if (TELL_ALL_KEYWORD.equals(id, ignoreCase = true)) {
                 for (message in messages) {
-                    if (message.sender.equals(sender, ignoreCase = true) && message.isReceived) {
+                    if (message.sender.equals(event.user.nick, ignoreCase = true) && message.isReceived) {
                         messages.remove(message)
                         deleted = true
                     }
                 }
                 if (deleted) {
                     save()
-                    bot.send(sender, "Delivered messages have been deleted.", isPrivate)
+                    event.sendMessage("Delivered messages have been deleted.")
                 } else {
-                    bot.send(sender, "No delivered messages were found.", isPrivate)
+                    event.sendMessage("No delivered messages were found.")
                 }
             } else {
                 var found = false
                 for (message in messages) {
                     found = (message.id == id)
-                    if (found && (message.sender.equals(sender, ignoreCase = true) || bot.isOp(sender))) {
+                    if (found && (message.sender.equals(event.user.nick, ignoreCase = true) || isChannelOp(
+                            channel,
+                            event
+                        ))
+                    ) {
                         messages.remove(message)
                         save()
-                        bot.send(sender, "Your message was deleted from the queue.", isPrivate)
+                        event.sendMessage("Your message was deleted from the queue.")
                         deleted = true
                         break
                     }
                 }
                 if (!deleted) {
                     if (found) {
-                        bot.send(sender, "Only messages that you sent can be deleted.", isPrivate)
+                        event.sendMessage("Only messages that you sent can be deleted.")
                     } else {
-                        bot.send(sender, "The specified message [ID $id] could not be found.", isPrivate)
+                        event.sendMessage("The specified message [ID $id] could not be found.")
                     }
                 }
             }
         } else {
-            helpResponse(args, sender, isOp, isPrivate)
+            helpResponse(channel, args, event)
         }
     }
 
@@ -124,30 +128,24 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
         helpFormat("%c $name ${View.VIEW_CMD}"),
         "Messages are kept for ${bold(maxDays)}" + " day".plural(maxDays.toLong()) + '.'
     )
-    override val isOp: Boolean = false
+    override val isOpOnly: Boolean = false
     override val isPublic: Boolean = isEnabled()
     override val isVisible: Boolean = isEnabled()
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
+    override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         if (isEnabled()) {
             if (args.isBlank()) {
-                helpResponse(args, sender, isOp, isPrivate)
+                helpResponse(channel, args, event)
             } else if (args.startsWith(View.VIEW_CMD)) {
-                if (bot.isOp(sender) && "${View.VIEW_CMD} $TELL_ALL_KEYWORD" == args) {
-                    viewAll(sender, isPrivate)
+                if (isChannelOp(channel, event) && "${View.VIEW_CMD} $TELL_ALL_KEYWORD" == args) {
+                    viewAll(event)
                 } else {
-                    viewMessages(sender, isPrivate)
+                    viewMessages(event)
                 }
             } else if (args.startsWith("$TELL_DEL_KEYWORD ")) {
-                deleteMessage(sender, args, isOp, isPrivate)
+                deleteMessage(channel, args, event)
             } else {
-                newMessage(sender, args, isOp, isPrivate)
+                newMessage(channel, args, event)
             }
             if (clean()) {
                 save()
@@ -169,21 +167,19 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
     }
 
     // New message.
-    private fun newMessage(sender: String, args: String, isOp: Boolean, isPrivate: Boolean) {
+    private fun newMessage(channel: String, args: String, event: GenericMessageEvent) {
         val split = args.split(" ".toRegex(), 2)
         if (split.size == 2 && split[1].isNotBlank() && split[1].contains(" ")) {
             if (messages.size < maxSize) {
-                val message = TellMessage(sender, split[0], split[1].trim())
+                val message = TellMessage(event.user.nick, split[0], split[1].trim())
                 messages.add(message)
                 save()
-                bot.send(
-                    sender, "Message [ID ${message.id}] was queued for ${bold(message.recipient)}", isPrivate
-                )
+                event.sendMessage("Message [ID ${message.id}] was queued for ${bold(message.recipient)}")
             } else {
-                bot.send(sender, "Sorry, the messages queue is currently full.", isPrivate)
+                event.sendMessage("Sorry, the messages queue is currently full.")
             }
         } else {
-            helpResponse(args, sender, isOp, isPrivate)
+            helpResponse(channel, args, event)
         }
     }
 
@@ -191,34 +187,30 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
      * Saves the messages queue.
      */
     private fun save() {
-        TellMessagesMgr.save(serializedObject, messages, bot.logger)
+        TellMessagesMgr.save(serialObject, messages)
     }
 
     /**
      * Checks and sends messages.
      */
-    @JvmOverloads
-    fun send(nickname: String, isMessage: Boolean = false) {
-        if (isEnabled() && nickname != bot.nick) {
+    fun send(event: GenericUserEvent) {
+        val nickname = event.user.nick
+        if (isEnabled() && nickname != event.getBot<PircBotX>().nick) {
             messages.stream().filter { message: TellMessage -> message.isMatch(nickname) }
                 .forEach { message: TellMessage ->
                     if (message.recipient.equals(nickname, ignoreCase = true) && !message.isReceived) {
                         if (message.sender == nickname) {
-                            if (!isMessage) {
-                                bot.send(
-                                    nickname,
-                                    "${bold("You")} wanted me to remind you: ${reverseColor(message.message)}",
-                                    true
+                            if (event !is MessageEvent) {
+                                event.user.send().message(
+                                    "${bold("You")} wanted me to remind you: ${reverseColor(message.message)}"
                                 )
                                 message.isReceived = true
                                 message.isNotified = true
                                 save()
                             }
                         } else {
-                            bot.send(
-                                nickname,
-                                "${message.sender} wanted me to tell you: ${reverseColor(message.message)}",
-                                true
+                            event.user.send().message(
+                                "${message.sender} wanted me to tell you: ${reverseColor(message.message)}"
                             )
                             message.isReceived = true
                             save()
@@ -226,11 +218,9 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
                     } else if (message.sender.equals(nickname, ignoreCase = true) && message.isReceived
                         && !message.isNotified
                     ) {
-                        bot.send(
-                            nickname,
-                            "Your message ${reverseColor("[ID " + message.id + ']')} was sent to "
-                                    + "${bold(message.recipient)} on ${message.receptionDate.toUtcDateTime()}",
-                            true
+                        event.user.send().message(
+                            "Your message ${reverseColor("[ID ${message.id}]")} was sent to "
+                                    + "${bold(message.recipient)} on ${message.receptionDate}"
                         )
                         message.isNotified = true
                         save()
@@ -247,66 +237,55 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
     fun size(): Int = messages.size
 
     // View all messages.
-    private fun viewAll(sender: String, isPrivate: Boolean) {
+    private fun viewAll(event: GenericMessageEvent) {
         if (messages.isNotEmpty()) {
             for (message in messages) {
-                bot.send(
-                    sender, bold(message.sender) + ARROW + bold(message.recipient)
-                            + " [ID: " + message.id + ", "
-                            + (if (message.isReceived) "DELIVERED" else "QUEUED") + ']',
-                    isPrivate
+                event.sendMessage(
+                    "${bold(message.sender)}$ARROW${bold(message.recipient)} [ID: ${message.id}, " +
+                            (if (message.isReceived) "DELIVERED]" else "QUEUED]")
                 )
             }
         } else {
-            bot.send(sender, "There are no messages in the queue.", isPrivate)
+            event.sendMessage("There are no messages in the queue.")
         }
     }
 
     // View messages.
-    private fun viewMessages(sender: String, isPrivate: Boolean) {
+    private fun viewMessages(event: GenericMessageEvent) {
         var hasMessage = false
         for (message in messages) {
-            if (message.isMatch(sender)) {
+            if (message.isMatch(event.user.nick)) {
                 if (!hasMessage) {
-                    hasMessage = true
-                    bot.send(sender, "Here are your messages: ", isPrivate)
+                    hasMessage = true; event.sendMessage("Here are your messages: ")
                 }
                 if (message.isReceived) {
-                    bot.send(
-                        sender,
-                        bold(message.sender) + ARROW + bold(message.recipient)
-                                + " [${message.receptionDate.toUtcDateTime()}, ID: "
-                                + bold(message.id) + ", DELIVERED]",
-                        isPrivate
+                    event.sendMessage(
+                        bold(message.sender) + ARROW + bold(message.recipient) +
+                                " [${message.receptionDate.toUtcDateTime()}, ID: ${bold(message.id)}, DELIVERED]"
                     )
                 } else {
-                    bot.send(
-                        sender,
-                        bold(message.sender) + ARROW + bold(message.recipient)
-                                + " [${message.queued.toUtcDateTime()}, ID: "
-                                + bold(message.id) + ", QUEUED]",
-                        isPrivate
+                    event.sendMessage(
+                        bold(message.sender) + ARROW + bold(message.recipient) +
+                                " [${message.queued.toUtcDateTime()}, ID: ${bold(message.id)}, QUEUED]"
                     )
                 }
-                bot.send(sender, helpFormat(message.message), isPrivate)
+                event.sendMessage(helpFormat(message.message))
             }
         }
         if (!hasMessage) {
-            bot.send(sender, "You have no messages in the queue.", isPrivate)
+            event.sendMessage("You have no messages in the queue.")
         } else {
-            bot.send(sender, "To delete one or all delivered messages:", isPrivate)
-            bot.send(
-                sender,
+            event.sendMessage("To delete one or all delivered messages:")
+            event.sendMessage(
                 helpFormat(
                     buildCmdSyntax(
                         "%c $name $TELL_DEL_KEYWORD <id|$TELL_ALL_KEYWORD>",
-                        bot.nick,
-                        isPrivate
+                        event.user.nick,
+                        true
                     )
-                ),
-                isPrivate
+                )
             )
-            bot.send(sender, help.last(), isPrivate)
+            event.sendMessage(help.last())
         }
     }
 
@@ -324,9 +303,6 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
         // Arrow
         private const val ARROW = " --> "
 
-        // Serialized object file extension
-        private const val SER_EXT = ".ser"
-
         // All keyword
         private const val TELL_ALL_KEYWORD = "all"
 
@@ -341,8 +317,7 @@ class Tell(bot: Mobibot) : AbstractCommand(bot) {
         initProperties(MAX_DAYS_PROP, MAX_SIZE_PROP)
 
         // Load the message queue
-        serializedObject = bot.logsDir + bot.name + SER_EXT
-        messages.addAll(TellMessagesMgr.load(serializedObject, bot.logger))
+        messages.addAll(TellMessagesMgr.load(serialObject))
         if (clean()) {
             save()
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
index 47521d4..eb058b7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
@@ -66,12 +66,12 @@ class TellMessage internal constructor(
     var id: String = queued.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))
 
     /**
-     * Returns {@code true) if a notification was sent.
+     * Returns {@code true} if a notification was sent.
      */
     var isNotified = false
 
     /**
-     * Returns {@code true) if the message was received.
+     * Returns {@code true} if the message was received.
      */
     var isReceived = false
         set(value) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
index c11e23e..5960b63 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -31,10 +31,10 @@
  */
 package net.thauvin.erik.mobibot.commands.tell
 
-import org.apache.logging.log4j.Logger
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
-import java.io.FileNotFoundException
 import java.io.IOException
 import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
@@ -42,11 +42,14 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.time.Clock
 import java.time.LocalDateTime
+import kotlin.io.path.exists
 
 /**
  * The Tell Messages Manager.
  */
 object TellMessagesMgr {
+    val logger: Logger = LoggerFactory.getLogger(TellMessagesMgr::class.java)
+
     /**
      * Cleans the messages queue.
      */
@@ -58,22 +61,22 @@ object TellMessagesMgr {
     /**
      * Loads the messages.
      */
-
-    fun load(file: String, logger: Logger): List<TellMessage> {
-        try {
-            ObjectInputStream(
-                BufferedInputStream(Files.newInputStream(Paths.get(file)))
-            ).use { input ->
-                if (logger.isDebugEnabled) logger.debug("Loading the messages.")
-                @Suppress("UNCHECKED_CAST")
-                return input.readObject() as List<TellMessage>
+    fun load(file: String): List<TellMessage> {
+        val serialFile = Paths.get(file)
+        if (serialFile.exists()) {
+            try {
+                ObjectInputStream(
+                    BufferedInputStream(Files.newInputStream(serialFile))
+                ).use { input ->
+                    if (logger.isDebugEnabled) logger.debug("Loading the messages.")
+                    @Suppress("UNCHECKED_CAST")
+                    return input.readObject() as List<TellMessage>
+                }
+            } catch (e: IOException) {
+                logger.error("An IO error occurred loading the messages queue.", e)
+            } catch (e: ClassNotFoundException) {
+                logger.error("An error occurred loading the messages queue.", e)
             }
-        } catch (ignore: FileNotFoundException) {
-            // Do nothing
-        } catch (e: IOException) {
-            logger.error("An IO error occurred loading the messages queue.", e)
-        } catch (e: ClassNotFoundException) {
-            logger.error("An error occurred loading the messages queue.", e)
         }
         return listOf()
     }
@@ -81,7 +84,7 @@ object TellMessagesMgr {
     /**
      * Saves the messages.
      */
-    fun save(file: String, messages: List<TellMessage?>?, logger: Logger) {
+    fun save(file: String, messages: List<TellMessage?>?) {
         try {
             BufferedOutputStream(Files.newOutputStream(Paths.get(file))).use { bos ->
                 ObjectOutputStream(bos).use { output ->
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/Entries.kt
similarity index 74%
rename from src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt
rename to src/main/kotlin/net/thauvin/erik/mobibot/entries/Entries.kt
index 803ab58..78602f6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Kill.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/Entries.kt
@@ -1,5 +1,5 @@
 /*
- * Kill.kt
+ * Entries.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -30,26 +30,26 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package net.thauvin.erik.mobibot.commands
+package net.thauvin.erik.mobibot.entries
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.today
 
-class Kill(bot: Mobibot) : AbstractCommand(bot) {
-    override val name = "kill"
-    override val help = emptyList<String>()
-    override val isOp = true
-    override val isPublic = false
-    override val isVisible = false
+class Entries(
+    var channel: String = "",
+    var ircServer: String = "",
+    var logsDir: String = "",
+    var backlogs: String = ""
+) {
+    val links = mutableListOf<EntryLink>()
 
-    override fun commandResponse(
-        sender: String,
-        login: String,
-        args: String,
-        isOp: Boolean,
-        isPrivate: Boolean
-    ) {
-        if (isOp) {
-            bot.shutdown(sender, true)
-        }
+    var lastPubDate = today()
+
+    fun load() {
+        lastPubDate = FeedsMgr.loadFeed(this)
+    }
+
+    fun save() {
+        lastPubDate = today()
+        FeedsMgr.saveFeed(this)
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
deleted file mode 100644
index 6fe809b..0000000
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesMgr.kt
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * EntriesMgr.kt
- *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *   Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- *
- *   Neither the name of this project nor the names of its contributors may be
- *   used to endorse or promote products derived from this software without
- *   specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.thauvin.erik.mobibot.entries
-
-import com.rometools.rome.feed.synd.SyndContentImpl
-import com.rometools.rome.feed.synd.SyndEntry
-import com.rometools.rome.feed.synd.SyndEntryImpl
-import com.rometools.rome.feed.synd.SyndFeed
-import com.rometools.rome.feed.synd.SyndFeedImpl
-import com.rometools.rome.io.FeedException
-import com.rometools.rome.io.SyndFeedInput
-import com.rometools.rome.io.SyndFeedOutput
-import net.thauvin.erik.mobibot.Mobibot
-import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
-import java.io.IOException
-import java.io.InputStreamReader
-import java.io.OutputStreamWriter
-import java.nio.charset.StandardCharsets
-import java.nio.file.Files
-import java.nio.file.Paths
-import java.util.Calendar
-
-/**
- * Manages the feed entries.
- */
-object EntriesMgr {
-    /**
-     * The name of the file containing the current entries.
-     */
-    const val CURRENT_XML = "current.xml"
-
-    /**
-     * The name of the file containing the backlog entries.
-     */
-    const val NAV_XML = "nav.xml"
-
-    /**
-     * The .xml extension
-     */
-    const val XML_EXT = ".xml"
-
-    // Maximum number of backlogs to keep
-    private const val maxBacklogs = 10
-
-    // Daily backup
-    private fun dailyBackup(
-        bot: Mobibot,
-        history: MutableList<String>
-    ) {
-        if (bot.backlogsUrl.isNotBlank()) {
-            if (!history.contains(bot.today)) {
-                history.add(bot.today)
-                while (history.size > maxBacklogs) {
-                    history.removeFirst()
-                }
-            }
-            OutputStreamWriter(
-                Files.newOutputStream(Paths.get(bot.logsDir + NAV_XML)), StandardCharsets.UTF_8
-            ).use { fw ->
-                val output = SyndFeedOutput()
-                val rss: SyndFeed = SyndFeedImpl()
-                val items: MutableList<SyndEntry> = mutableListOf()
-                var item: SyndEntry
-                with(rss) {
-                    feedType = "rss_2.0"
-                    title = "${bot.channel} IRC Links Backlogs"
-                    description = "Backlogs of Links from ${bot.ircServer} on ${bot.channel}"
-                    link = bot.backlogsUrl
-                    publishedDate = Calendar.getInstance().time
-                }
-                var date: String
-                items.clear()
-                for (i in history.size - 1 downTo 0) {
-                    date = history[i]
-                    item = SyndEntryImpl()
-                    with(item) {
-                        link = bot.backlogsUrl + date + ".xml"
-                        title = date
-                        description = SyndContentImpl().apply { value = "Links for $date" }
-                    }
-                    items.add(item)
-                }
-                rss.entries = items
-                if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the backlog feed.")
-                output.output(rss, fw)
-            }
-        } else {
-            if (bot.logger.isErrorEnabled) {
-                bot.logger.warn("Unable to generate the backlogs feed. No property configured.")
-            }
-        }
-    }
-
-    /**
-     * Loads the backlogs.
-     */
-    @Throws(IOException::class, FeedException::class)
-    fun loadBacklogs(file: String, history: MutableList<String>) {
-        history.clear()
-        val input = SyndFeedInput()
-        InputStreamReader(Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8).use { reader ->
-            val feed = input.build(reader)
-            val items = feed.entries
-            for (i in items.indices.reversed()) {
-                history.add(items[i].title)
-            }
-        }
-    }
-
-    /**
-     * Loads the current entries.
-     */
-    @Throws(IOException::class, FeedException::class)
-    fun loadEntries(file: String, channel: String, entries: MutableList<EntryLink>): String {
-        entries.clear()
-        val input = SyndFeedInput()
-        var today: String
-        InputStreamReader(
-            Files.newInputStream(Paths.get(file)), StandardCharsets.UTF_8
-        ).use { reader ->
-            val feed = input.build(reader)
-            today = feed.publishedDate.toIsoLocalDate()
-            val items = feed.entries
-            var entry: EntryLink
-            for (i in items.indices.reversed()) {
-                with(items[i]) {
-                    entry = EntryLink(
-                        link,
-                        title,
-                        author.substring(author.lastIndexOf('(') + 1, author.length - 1),
-                        channel,
-                        publishedDate,
-                        categories
-                    )
-                    var split: List<String>
-                    for (comment in description.value.split("<br/>")) {
-                        split = comment.split(": ".toRegex(), 2)
-                        if (split.size == 2) {
-                            entry.addComment(comment = split[1].trim(), nick = split[0].trim())
-                        }
-                    }
-                }
-                entries.add(entry)
-            }
-        }
-        return today
-    }
-
-    /**
-     * Saves the entries.
-     */
-    fun saveEntries(
-        bot: Mobibot,
-        entries: List<EntryLink>,
-        history: MutableList<String>,
-        isDayBackup: Boolean
-    ) {
-        if (bot.logger.isDebugEnabled) bot.logger.debug("Saving the feeds...")
-        if (bot.logsDir.isNotBlank() && bot.weblogUrl.isNotBlank()) {
-            try {
-                val output = SyndFeedOutput()
-                val rss: SyndFeed = SyndFeedImpl()
-                val items: MutableList<SyndEntry> = mutableListOf()
-                var item: SyndEntry
-                OutputStreamWriter(
-                    Files.newOutputStream(Paths.get(bot.logsDir + CURRENT_XML)), StandardCharsets.UTF_8
-                ).use { fw ->
-                    with(rss) {
-                        feedType = "rss_2.0"
-                        title = bot.channel + " IRC Links"
-                        description = "Links from ${bot.ircServer} on ${bot.channel}"
-                        link = bot.weblogUrl
-                        publishedDate = Calendar.getInstance().time
-                        language = "en"
-                    }
-                    val buff: StringBuilder = StringBuilder()
-                    for (i in entries.size - 1 downTo 0) {
-                        with(entries[i]) {
-                            buff.setLength(0)
-                            buff.append("Posted by <b>")
-                                .append(nick)
-                                .append("</b> on <a href=\"irc://")
-                                .append(bot.ircServer).append('/')
-                                .append(channel)
-                                .append("\"><b>")
-                                .append(channel)
-                                .append("</b></a>")
-                            if (comments.size > 0) {
-                                buff.append(" <br/><br/>")
-                                for (j in comments.indices) {
-                                    if (j > 0) {
-                                        buff.append(" <br/>")
-                                    }
-                                    buff.append(comments[j].nick).append(": ").append(comments[j].comment)
-                                }
-                            }
-                            item = SyndEntryImpl()
-                            item.link = link
-                            item.description = SyndContentImpl().apply { value = buff.toString() }
-                            item.title = title
-                            item.publishedDate = date
-                            item.author = "${bot.channel.substring(1)}@${bot.ircServer} ($nick)"
-                            item.categories = tags
-                            items.add(item)
-                        }
-                    }
-                    rss.entries = items
-                    if (bot.logger.isDebugEnabled) bot.logger.debug("Writing the entries feed.")
-                    output.output(rss, fw)
-                }
-                OutputStreamWriter(
-                    Files.newOutputStream(
-                        Paths.get(
-                            bot.logsDir + bot.today + XML_EXT
-                        )
-                    ), StandardCharsets.UTF_8
-                ).use { fw -> output.output(rss, fw) }
-                if (isDayBackup) {
-                    dailyBackup(bot, history)
-                }
-            } catch (e: FeedException) {
-                if (bot.logger.isWarnEnabled) bot.logger.warn("Unable to generate the entries feed.", e)
-            } catch (e: IOException) {
-                if (bot.logger.isWarnEnabled)
-                    bot.logger.warn("An IO error occurred while generating the entries feed.", e)
-            }
-        } else {
-            if (bot.logger.isWarnEnabled) {
-                bot.logger.warn("Unable to generate the entries feed. A required property is missing.")
-            }
-        }
-    }
-}
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index cf0bf35..b577895 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -40,22 +40,22 @@ import net.thauvin.erik.mobibot.Utils.green
  */
 object EntriesUtils {
     /**
-     * Build link cmd based on its index. e.g: L1
+     * Build link label based on its index. e.g: L1
      */
-    fun buildLinkCmd(index: Int): String = Constants.LINK_CMD + (index + 1)
+    fun buildLinkLabel(index: Int): String = Constants.LINK_CMD + (index + 1)
 
     /**
      * Builds an entry's comment for display on the channel.
      */
     fun buildComment(entryIndex: Int, commentIndex: Int, comment: EntryComment): String =
-        ("${buildLinkCmd(entryIndex)}.${commentIndex + 1}: [${comment.nick}] ${comment.comment}")
+        ("${buildLinkLabel(entryIndex)}.${commentIndex + 1}: [${comment.nick}] ${comment.comment}")
 
     /**
      * Builds an entry's link for display on the channel.
      */
     @JvmOverloads
     fun buildLink(entryIndex: Int, entry: EntryLink, isView: Boolean = false): String {
-        val buff = StringBuilder().append(buildLinkCmd(entryIndex)).append(": ")
+        val buff = StringBuilder().append(buildLinkLabel(entryIndex)).append(": ")
             .append('[').append(entry.nick).append(']')
         if (isView && entry.comments.isNotEmpty()) {
             buff.append("[+").append(entry.comments.size).append(']')
@@ -76,5 +76,5 @@ object EntriesUtils {
      * Build an entry's tags/categories for display on the channel.
      */
     fun buildTags(entryIndex: Int, entry: EntryLink): String =
-        buildLinkCmd(entryIndex) + "${Constants.TAG_CMD}: " + entry.pinboardTags.replace(",", ", ")
+        buildLinkLabel(entryIndex) + "${Constants.TAG_CMD}: " + entry.pinboardTags.replace(",", ", ")
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
index 1a8468f..d7730a5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -109,16 +109,25 @@ class EntryLink : Serializable {
      */
     fun addComment(comment: String, nick: String): Int {
         comments.add(EntryComment(comment, nick))
-        return comments.size - 1
+        return comments.lastIndex
     }
 
     /**
      * Deletes a specific comment.
      */
-    fun deleteComment(index: Int) {
+    fun deleteComment(index: Int): Boolean {
         if (index < comments.size) {
             comments.removeAt(index)
+            return true
         }
+        return false
+    }
+
+    /**
+     * Deletes a comment.
+     */
+    fun deleteComment(entryComment: EntryComment): Boolean {
+        return comments.remove(entryComment)
     }
 
     /**
@@ -154,7 +163,7 @@ class EntryLink : Serializable {
      * Sets a comment.
      */
     fun setComment(index: Int, comment: String?, nick: String?) {
-        if (index < comments.size && (comment != null) && !nick.isNullOrBlank()) {
+        if (index < comments.size && !comment.isNullOrBlank() && !nick.isNullOrBlank()) {
             comments[index] = EntryComment(comment, nick)
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt
new file mode 100644
index 0000000..ccbcd46
--- /dev/null
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt
@@ -0,0 +1,190 @@
+/*
+ * FeedsMgr.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.entries
+
+import com.rometools.rome.feed.synd.SyndContentImpl
+import com.rometools.rome.feed.synd.SyndEntry
+import com.rometools.rome.feed.synd.SyndEntryImpl
+import com.rometools.rome.feed.synd.SyndFeed
+import com.rometools.rome.feed.synd.SyndFeedImpl
+import com.rometools.rome.io.FeedException
+import com.rometools.rome.io.SyndFeedInput
+import com.rometools.rome.io.SyndFeedOutput
+import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
+import net.thauvin.erik.mobibot.Utils.today
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.io.IOException
+import java.io.InputStreamReader
+import java.io.OutputStreamWriter
+import java.nio.charset.StandardCharsets
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Calendar
+import kotlin.io.path.exists
+
+/**
+ * Manages the RSS feeds.
+ */
+class FeedsMgr private constructor() {
+    companion object {
+        private val logger: Logger = LoggerFactory.getLogger(FeedsMgr::class.java)
+
+        // The file containing the current entries.
+        private const val currentXml = "current.xml"
+
+        // The .xml extension.
+        private const val dotXml = ".xml"
+
+        /**
+         * Loads the current feed.
+         */
+        @Throws(IOException::class, FeedException::class)
+        fun loadFeed(entries: Entries, currentFile: String = currentXml): String {
+            entries.links.clear()
+            val xml = Paths.get("${entries.logsDir}${currentFile}")
+            var pubDate = today()
+            if (xml.exists()) {
+                val input = SyndFeedInput()
+                InputStreamReader(
+                    Files.newInputStream(xml), StandardCharsets.UTF_8
+                ).use { reader ->
+                    val feed = input.build(reader)
+                    pubDate = feed.publishedDate.toIsoLocalDate()
+                    val items = feed.entries
+                    var entry: EntryLink
+                    for (i in items.indices.reversed()) {
+                        with(items[i]) {
+                            entry = EntryLink(
+                                link,
+                                title,
+                                author.substring(author.lastIndexOf('(') + 1, author.length - 1),
+                                entries.channel,
+                                publishedDate,
+                                categories
+                            )
+                            var split: List<String>
+                            for (comment in description.value.split("<br/>")) {
+                                split = comment.split(": ".toRegex(), 2)
+                                if (split.size == 2) {
+                                    entry.addComment(comment = split[1].trim(), nick = split[0].trim())
+                                }
+                            }
+                        }
+                        entries.links.add(entry)
+                    }
+                }
+            } else {
+                // Create an empty feed.
+                saveFeed(entries)
+            }
+            return pubDate
+        }
+
+        /**
+         * Saves the feeds.
+         */
+        fun saveFeed(entries: Entries, currentFile: String = currentXml) {
+            if (logger.isDebugEnabled) logger.debug("Saving the feeds...")
+            if (entries.logsDir.isNotBlank()) {
+                try {
+                    val output = SyndFeedOutput()
+                    val rss: SyndFeed = SyndFeedImpl()
+                    val items: MutableList<SyndEntry> = mutableListOf()
+                    var item: SyndEntry
+                    OutputStreamWriter(
+                        Files.newOutputStream(Paths.get("${entries.logsDir}${currentFile}")), StandardCharsets.UTF_8
+                    ).use { fw ->
+                        with(rss) {
+                            feedType = "rss_2.0"
+                            title = "${entries.channel} IRC Links"
+                            description = "Links from ${entries.ircServer} on ${entries.channel}"
+                            if (entries.backlogs.isNotBlank()) link = entries.backlogs
+                            publishedDate = Calendar.getInstance().time
+                            language = "en"
+                        }
+                        val buff: StringBuilder = StringBuilder()
+                        for (i in entries.links.indices.reversed()) {
+                            with(entries.links[i]) {
+                                buff.setLength(0)
+                                buff.append("Posted by <b>")
+                                    .append(nick)
+                                    .append("</b> on <a href=\"irc://")
+                                    .append(entries.ircServer).append('/')
+                                    .append(channel)
+                                    .append("\"><b>")
+                                    .append(channel)
+                                    .append("</b></a>")
+                                if (comments.size > 0) {
+                                    buff.append(" <br/><br/>")
+                                    for (j in comments.indices) {
+                                        if (j > 0) {
+                                            buff.append(" <br/>")
+                                        }
+                                        buff.append(comments[j].nick).append(": ").append(comments[j].comment)
+                                    }
+                                }
+                                item = SyndEntryImpl()
+                                item.link = link
+                                item.description = SyndContentImpl().apply { value = buff.toString() }
+                                item.title = title
+                                item.publishedDate = date
+                                item.author = "${channel.substring(1)}@${entries.ircServer} ($nick)"
+                                item.categories = tags
+                                items.add(item)
+                            }
+                        }
+                        rss.entries = items
+                        if (logger.isDebugEnabled) logger.debug("Writing the entries feed.")
+                        output.output(rss, fw)
+                    }
+                    OutputStreamWriter(
+                        Files.newOutputStream(
+                            Paths.get(
+                                entries.logsDir + today() + dotXml
+                            )
+                        ), StandardCharsets.UTF_8
+                    ).use { fw -> output.output(rss, fw) }
+                } catch (e: FeedException) {
+                    if (logger.isWarnEnabled) logger.warn("Unable to generate the entries feed.", e)
+                } catch (e: IOException) {
+                    if (logger.isWarnEnabled)
+                        logger.warn("An IO error occurred while generating the entries feed.", e)
+                }
+            } else {
+                if (logger.isWarnEnabled) {
+                    logger.warn("Unable to generate the entries feed. A required property is missing.")
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index 3c46fb4..372ef2d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -31,13 +31,16 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
+import net.thauvin.erik.mobibot.Utils.sendMessage
+import org.pircbotx.hooks.events.PrivateMessageEvent
+import org.pircbotx.hooks.types.GenericMessageEvent
 
 /**
  * The `Module` abstract class.
  */
-abstract class AbstractModule(val bot: Mobibot) {
+abstract class AbstractModule {
     /**
      * The module's commands, if any.
      */
@@ -51,12 +54,7 @@ abstract class AbstractModule(val bot: Mobibot) {
     /**
      * Responds to a command.
      */
-    abstract fun commandResponse(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    )
+    abstract fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent)
 
     /**
      * Returns the module's property keys.
@@ -74,9 +72,9 @@ abstract class AbstractModule(val bot: Mobibot) {
     /**
      * Responds with the module's help.
      */
-    open fun helpResponse(sender: String, isPrivate: Boolean): Boolean {
+    open fun helpResponse(event: GenericMessageEvent): Boolean {
         for (h in help) {
-            bot.send(sender, buildCmdSyntax(h, bot.nick, isPrivateMsgEnabled && isPrivate), isPrivate)
+            event.sendMessage(buildCmdSyntax(h, event.bot().nick, isPrivateMsgEnabled && event is PrivateMessageEvent))
         }
         return true
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
index 5ff5c73..efe87e5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -33,35 +33,32 @@ package net.thauvin.erik.mobibot.modules
 
 import net.objecthunter.exp4j.ExpressionBuilder
 import net.objecthunter.exp4j.tokenizer.UnknownFunctionOrVariableException
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.text.DecimalFormat
 
 /**
  * The Calc module.
  */
-class Calc(bot: Mobibot) : AbstractModule(bot) {
-    override fun commandResponse(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    ) {
+class Calc : AbstractModule() {
+    private val logger: Logger = LoggerFactory.getLogger(Calc::class.java)
+
+    override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         if (args.isNotBlank()) {
-            with(bot) {
-                try {
-                    send(calculate(args))
-                } catch (e: IllegalArgumentException) {
-                    if (logger.isWarnEnabled) logger.warn("Failed to calculate: $args", e)
-                    send("No idea. This is the kind of math I don't get.")
-                } catch (e: UnknownFunctionOrVariableException) {
-                    if (logger.isWarnEnabled) logger.warn("Unable to calculate: $args", e)
-                    send("No idea. I must've some form of Dyscalculia.")
-                }
+            try {
+                event.respond(calculate(args))
+            } catch (e: IllegalArgumentException) {
+                if (logger.isWarnEnabled) logger.warn("Failed to calculate: $args", e)
+                event.respond("No idea. This is the kind of math I don't get.")
+            } catch (e: UnknownFunctionOrVariableException) {
+                if (logger.isWarnEnabled) logger.warn("Unable to calculate: $args", e)
+                event.respond("No idea. I must've some form of Dyscalculia.")
             }
         } else {
-            helpResponse(sender, isPrivate)
+            helpResponse(event)
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index db28550..6cd8906 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -34,40 +34,44 @@ package net.thauvin.erik.mobibot.modules
 import net.thauvin.erik.crypto.CryptoException
 import net.thauvin.erik.crypto.CryptoPrice
 import net.thauvin.erik.crypto.CryptoPrice.Companion.spotPrice
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.msg.PublicMessage
+import net.thauvin.erik.mobibot.Utils.sendMessage
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.io.IOException
 
 /**
  * The Cryptocurrency Prices  module.
  */
-class CryptoPrices(bot: Mobibot) : ThreadedModule(bot) {
+class CryptoPrices : ThreadedModule() {
+    private val logger: Logger = LoggerFactory.getLogger(CryptoPrices::class.java)
+
     /**
      * Returns the cryptocurrency market price from [Coinbase](https://developers.coinbase.com/api/v2#get-spot-price).
      */
-    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+    override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         val debugMessage = "crypto($cmd $args)"
-        with(bot) {
-            if (args.matches("\\w+( [a-zA-Z]{3}+)?".toRegex())) {
-                try {
-                    val price = currentPrice(args.split(' '))
-                    val amount = try {
-                        price.toCurrency()
-                    } catch (ignore: IllegalArgumentException) {
-                        price.amount
-                    }
-                    send(sender, PublicMessage("${price.base}: $amount [${price.currency}]"))
-                } catch (e: CryptoException) {
-                    if (logger.isWarnEnabled) logger.warn("$debugMessage => ${e.statusCode}", e)
-                    send(e.message)
-                } catch (e: Exception) {
-                    if (logger.isErrorEnabled) logger.error(debugMessage, e)
-                    send("An error has occurred while retrieving the cryptocurrency market price.")
+        if (args.matches("\\w+( [a-zA-Z]{3}+)?".toRegex())) {
+            try {
+                val price = currentPrice(args.split(' '))
+                val amount = try {
+                    price.toCurrency()
+                } catch (ignore: IllegalArgumentException) {
+                    price.amount
                 }
-            } else {
-                helpResponse(sender, isPrivate)
+                event.respond("${price.base} current price is $amount [${price.currency}]")
+            } catch (e: CryptoException) {
+                if (logger.isWarnEnabled) logger.warn("$debugMessage => ${e.statusCode}", e)
+                event.sendMessage(e.message!!)
+            } catch (e: IOException) {
+                if (logger.isErrorEnabled) logger.error(debugMessage, e)
+                event.sendMessage("An IO error has occurred while retrieving the cryptocurrency market price.")
             }
+        } else {
+            helpResponse(event)
         }
+
     }
 
     companion object {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index e0b7088..cd4bb67 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -31,16 +31,21 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendList
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.PublicMessage
 import org.jdom2.JDOMException
 import org.jdom2.input.SAXBuilder
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.net.URL
 import java.text.NumberFormat
@@ -51,84 +56,68 @@ import javax.xml.XMLConstants
 /**
  * The CurrencyConverter module.
  */
-class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
-    override fun commandResponse(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    ) {
+class CurrencyConverter : ThreadedModule() {
+    private val logger: Logger = LoggerFactory.getLogger(CurrencyConverter::class.java)
+
+    override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         synchronized(this) {
             if (pubDate != today()) {
                 EXCHANGE_RATES.clear()
             }
         }
-        super.commandResponse(sender, cmd, args, isPrivate)
+        super.commandResponse(channel, cmd, args, event)
     }
 
     /**
      * Converts the specified currencies.
      */
-    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        bot.apply {
-            if (EXCHANGE_RATES.isEmpty()) {
-                try {
-                    loadRates()
-                } catch (e: ModuleException) {
-                    if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                }
+    override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
+        if (EXCHANGE_RATES.isEmpty()) {
+            try {
+                loadRates()
+            } catch (e: ModuleException) {
+                if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
             }
+        }
 
-            if (EXCHANGE_RATES.isEmpty()) {
-                send(sender, EMPTY_RATE_TABLE, true)
-            } else if (args.matches("\\d+([,\\d]+)?(\\.\\d+)? [a-zA-Z]{3}+ to [a-zA-Z]{3}+".toRegex())) {
-                val msg = convertCurrency(args)
-                send(sender, msg)
-                if (msg.isError) {
-                    helpResponse(sender, isPrivate)
-                }
-            } else if (args.contains(CURRENCY_RATES_KEYWORD)) {
-                send(sender, "The reference rates for ${bold(pubDate)} are:", isPrivate)
-                @Suppress("MagicNumber")
-                sendList(sender, currencyRates(), 3, "   ", isPrivate, isIndent = true)
-            } else {
-                helpResponse(sender, isPrivate)
+        if (EXCHANGE_RATES.isEmpty()) {
+            event.respond(EMPTY_RATE_TABLE)
+        } else if (args.matches("\\d+([,\\d]+)?(\\.\\d+)? [a-zA-Z]{3}+ to [a-zA-Z]{3}+".toRegex())) {
+            val msg = convertCurrency(args)
+            event.respond(msg.msg)
+            if (msg.isError) {
+                helpResponse(event)
             }
+        } else if (args.contains(CURRENCY_RATES_KEYWORD)) {
+            event.sendMessage("The reference rates for ${bold(pubDate)} are:")
+            event.sendList(currencyRates(), 3, "   ", isIndent = true)
+        } else {
+            helpResponse(event)
         }
     }
 
-    override fun helpResponse(sender: String, isPrivate: Boolean): Boolean {
-        with(bot) {
-            if (EXCHANGE_RATES.isEmpty()) {
-                try {
-                    loadRates()
-                } catch (e: ModuleException) {
-                    if (logger.isDebugEnabled) logger.debug(e.debugMessage, e)
-                }
+    override fun helpResponse(event: GenericMessageEvent): Boolean {
+        if (EXCHANGE_RATES.isEmpty()) {
+            try {
+                loadRates()
+            } catch (e: ModuleException) {
+                if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
             }
-            if (EXCHANGE_RATES.isEmpty()) {
-                send(sender, EMPTY_RATE_TABLE, isPrivate)
-            } else {
-                send(sender, "To convert from one currency to another:", isPrivate)
-                send(
-                    sender,
-                    helpFormat(
-                        buildCmdSyntax("%c $CURRENCY_CMD 100 USD to EUR", nick, isPrivateMsgEnabled)
-                    ),
-                    isPrivate
+        }
+        if (EXCHANGE_RATES.isEmpty()) {
+            event.sendMessage(EMPTY_RATE_TABLE)
+        } else {
+            val nick = event.bot().nick
+            event.sendMessage("To convert from one currency to another:")
+            event.sendMessage(helpFormat(buildCmdSyntax("%c $CURRENCY_CMD 100 USD to EUR", nick, isPrivateMsgEnabled)))
+            event.sendMessage("For a listing of current reference rates:")
+            event.sendMessage(
+                helpFormat(
+                    buildCmdSyntax("%c $CURRENCY_CMD $CURRENCY_RATES_KEYWORD", nick, isPrivateMsgEnabled)
                 )
-                send(sender, "For a listing of current reference rates:", isPrivate)
-                send(
-                    sender,
-                    helpFormat(
-                        buildCmdSyntax("%c $CURRENCY_CMD $CURRENCY_RATES_KEYWORD", nick, isPrivateMsgEnabled)
-                    ),
-                    isPrivate
-                )
-                send(sender, "The supported currencies are: ", isPrivate)
-                @Suppress("MagicNumber")
-                sendList(sender, ArrayList(EXCHANGE_RATES.keys), 11, isPrivate = isPrivate, isIndent = true)
-            }
+            )
+            event.sendMessage("The supported currencies are: ")
+            event.sendList(ArrayList(EXCHANGE_RATES.keys), 11, isIndent = true)
         }
         return true
     }
@@ -161,7 +150,6 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         /**
          * Converts from a currency to another.
          */
-        @Suppress("MagicNumber")
         @JvmStatic
         fun convertCurrency(query: String): Message {
             val cmds = query.split(" ")
@@ -194,7 +182,6 @@ class CurrencyConverter(bot: Mobibot) : ThreadedModule(bot) {
         fun currencyRates(): List<String> {
             val rates = mutableListOf<String>()
             for ((key, value) in EXCHANGE_RATES.toSortedMap()) {
-                @Suppress("MagicNumber")
                 rates.add("$key: ${value.padStart(8)}")
             }
             return rates
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 57e78ca..4b7257e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -31,37 +31,33 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import org.pircbotx.hooks.types.GenericMessageEvent
 import kotlin.random.Random
 
 /**
  * The Dice module.
  */
-class Dice(bot: Mobibot) : AbstractModule(bot) {
-    override fun commandResponse(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    ) {
+class Dice : AbstractModule() {
+    override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         val botRoll = roll()
         val roll = roll()
         val botTotal = botRoll.first + botRoll.second
         val total = roll.first + roll.second
-        with(bot) {
-            send(
-                channel,
-                "$sender rolled ${total}: ${DICE_FACES[roll.first]}  ${DICE_FACES[roll.second]}",
-                isPrivate
+        with(event.bot()) {
+            event.respond(
+                "you rolled ${DICE_FACES[roll.first]}  ${DICE_FACES[roll.second]}  for a total of ${bold(total)}"
             )
-            action(
-                "rolled ${botTotal}: ${DICE_FACES[botRoll.first]}  ${DICE_FACES[botRoll.second]}"
+            sendIRC().action(
+                channel,
+                "rolled ${DICE_FACES[botRoll.first]}  ${DICE_FACES[botRoll.second]}  for a total of ${bold(botTotal)}"
             )
             when (winLoseOrTie(botTotal, total)) {
-                Result.WIN -> action("wins.")
-                Result.LOSE -> action("lost.")
-                else -> action("tied.")
+                Result.WIN -> sendIRC().action(channel, "wins.")
+                Result.LOSE -> sendIRC().action(channel, "lost.")
+                else -> sendIRC().action(channel, "tied.")
             }
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index 5c1a268..9571556 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -31,45 +31,49 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.encodeUrl
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.unescapeXml
 import net.thauvin.erik.mobibot.Utils.urlReader
+import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
-import org.jibble.pircbot.Colors
 import org.json.JSONException
 import org.json.JSONObject
+import org.pircbotx.Colors
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.net.URL
 
 /**
  * The GoogleSearch module.
  */
-class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
+class GoogleSearch : ThreadedModule() {
+    private val logger: Logger = LoggerFactory.getLogger(GoogleSearch::class.java)
+
     /**
      * Searches Google.
      */
-    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        with(bot) {
-            if (args.isNotBlank()) {
-                try {
-                    val results = searchGoogle(
-                        args, properties[GOOGLE_API_KEY_PROP],
-                        properties[GOOGLE_CSE_KEY_PROP]
-                    )
-                    for (msg in results) {
-                        send(sender, msg)
-                    }
-                } catch (e: ModuleException) {
-                    if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                    send(sender, e.message, isPrivate)
+    override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
+        if (args.isNotBlank()) {
+            try {
+                val results = searchGoogle(
+                    args, properties[GOOGLE_API_KEY_PROP],
+                    properties[GOOGLE_CSE_KEY_PROP]
+                )
+                for (msg in results) {
+                    event.sendMessage(channel, msg)
                 }
-            } else {
-                helpResponse(sender, isPrivate)
+            } catch (e: ModuleException) {
+                if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
+                event.sendMessage(e.message!!)
             }
+        } else {
+            helpResponse(event)
         }
     }
 
@@ -92,29 +96,33 @@ class GoogleSearch(bot: Mobibot) : ThreadedModule(bot) {
             if (apiKey.isNullOrBlank() || cseKey.isNullOrBlank()) {
                 throw ModuleException("${GOOGLE_CMD.capitalise()} is disabled. The API keys are missing.")
             }
-            return if (query.isNotBlank()) {
-                val results = mutableListOf<Message>()
+            val results = mutableListOf<Message>()
+            if (query.isNotBlank()) {
                 try {
                     val url = URL(
                         "https://www.googleapis.com/customsearch/v1?key=$apiKey&cx=$cseKey" +
                                 "&q=${encodeUrl(query)}&filter=1&num=5&alt=json"
                     )
                     val json = JSONObject(urlReader(url))
-                    val ja = json.getJSONArray("items")
-                    for (i in 0 until ja.length()) {
-                        val j = ja.getJSONObject(i)
-                        results.add(NoticeMessage(unescapeXml(j.getString("title"))))
-                        results.add(NoticeMessage(helpFormat(j.getString("link"), false), Colors.DARK_GREEN))
+                    if (json.has("items")) {
+                        val ja = json.getJSONArray("items")
+                        for (i in 0 until ja.length()) {
+                            val j = ja.getJSONObject(i)
+                            results.add(NoticeMessage(unescapeXml(j.getString("title"))))
+                            results.add(NoticeMessage(helpFormat(j.getString("link"), false), Colors.DARK_GREEN))
+                        }
+                    } else {
+                        results.add(ErrorMessage("No results found.", Colors.RED))
                     }
                 } catch (e: IOException) {
                     throw ModuleException("searchGoogle($query)", "An IO error has occurred searching Google.", e)
                 } catch (e: JSONException) {
                     throw ModuleException("searchGoogle($query)", "A JSON error has occurred searching Google.", e)
                 }
-                results
             } else {
-                throw ModuleException("Invalid query. Please try again.")
+                results.add(ErrorMessage("Invalid query. Please try again."))
             }
+            return results
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
index d3e0ca8..2d5af61 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -33,42 +33,43 @@ package net.thauvin.erik.mobibot.modules
 
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.cyan
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.urlReader
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.PublicMessage
 import org.json.JSONException
 import org.json.JSONObject
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.net.URL
 
 /**
  * The Joke module.
  */
-class Joke(bot: Mobibot) : ThreadedModule(bot) {
-    override fun commandResponse(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    ) {
+class Joke : ThreadedModule() {
+    private val logger: Logger = LoggerFactory.getLogger(Joke::class.java)
+
+    override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         runBlocking {
-            launch { run(sender, cmd, args, isPrivate) }
+            launch { run(channel, cmd, args, event) }
         }
     }
 
     /**
      * Returns a random joke from [The Internet Chuck Norris Database](http://www.icndb.com/).
      */
-    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        with(bot) {
+    override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
+        with(event.bot()) {
             try {
-                send(cyan(randomJoke().msg))
+                sendIRC().notice(channel, cyan(randomJoke().msg))
             } catch (e: ModuleException) {
                 if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                send(sender, e.message, isPrivate)
+                event.sendMessage(e.message!!)
             }
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
index e1557d9..703f138 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -32,9 +32,12 @@
 package net.thauvin.erik.mobibot.modules
 
 import net.thauvin.erik.mobibot.Constants
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import org.apache.commons.net.whois.WhoisClient
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.net.InetAddress
 import java.net.UnknownHostException
@@ -42,52 +45,51 @@ import java.net.UnknownHostException
 /**
  * The Lookup module.
  */
-class Lookup(bot: Mobibot) : AbstractModule(bot) {
-    override fun commandResponse(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    ) {
+class Lookup : AbstractModule() {
+    private val logger: Logger = LoggerFactory.getLogger(Lookup::class.java)
+
+    override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         if (args.matches("(\\S.)+(\\S)+".toRegex())) {
-            with(bot) {
-                try {
-                    nslookup(args).split(',').forEach {
-                        send(it.trim())
-                    }
-                } catch (ignore: UnknownHostException) {
-                    if (args.matches(
-                            ("(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
-                                    "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
-                                    "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)").toRegex()
-                        )
-                    ) {
-                        try {
-                            val lines = whois(args)
-                            if (lines.isNotEmpty()) {
-                                var line: String
-                                for (rawLine in lines) {
-                                    line = rawLine.trim()
-                                    if (line.isNotEmpty() && line[0] != '#') {
-                                        send(line)
+            try {
+                event.respondWith(nslookup(args).prependIndent())
+            } catch (ignore: UnknownHostException) {
+                if (args.matches(
+                        ("(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
+                                "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
+                                "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)").toRegex()
+                    )
+                ) {
+                    try {
+                        val lines = whois(args)
+                        if (lines.isNotEmpty()) {
+                            var line: String
+                            var hasData = false
+                            for (rawLine in lines) {
+                                line = rawLine.trim()
+                                if (line.matches("^\\b(?!\\b[Cc]omment\\b)\\w+\\b: .*$".toRegex())) {
+                                    if (!hasData) {
+                                        event.respondWith(line)
+                                        hasData = true
+                                    } else {
+                                        event.bot().sendIRC().notice(event.user.nick, line)
                                     }
                                 }
-                            } else {
-                                send("Unknown host.")
                             }
-                        } catch (ioe: IOException) {
-                            if (logger.isDebugEnabled) {
-                                logger.debug("Unable to perform whois IP lookup: $args", ioe)
-                            }
-                            send("Unable to perform whois IP lookup: ${ioe.message}")
+                        } else {
+                            event.respond("Unknown host.")
                         }
-                    } else {
-                        send("Unknown host.")
+                    } catch (ioe: IOException) {
+                        if (logger.isWarnEnabled) {
+                            logger.warn("Unable to perform whois IP lookup: $args", ioe)
+                        }
+                        event.respond("Unable to perform whois IP lookup: ${ioe.message}")
                     }
+                } else {
+                    event.respond("Unknown host.")
                 }
             }
         } else {
-            helpResponse(sender, true)
+            helpResponse(event)
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
index 0a97d7b..9d49118 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
@@ -31,24 +31,20 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import org.pircbotx.hooks.types.GenericMessageEvent
 import kotlin.random.Random
 
 /**
  * The Ping module.
  */
-class Ping(bot: Mobibot) : AbstractModule(bot) {
+class Ping : AbstractModule() {
     /**
      * {@inheritDoc}
      */
-    override fun commandResponse(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    ) {
-        bot.action(randomPing())
+    override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
+        event.bot().sendIRC().action(channel, randomPing())
     }
 
     companion object {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 33b1fce..20c5c29 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -32,16 +32,17 @@
 
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Mobibot
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import org.pircbotx.hooks.types.GenericMessageEvent
 import kotlin.random.Random
 
 
 /**
  * Simple module example in Kotlin.
  */
-class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
+class RockPaperScissors : AbstractModule() {
     init {
         with(commands) {
             add(Hands.ROCK.name.lowercase())
@@ -101,20 +102,26 @@ class RockPaperScissors(bot: Mobibot) : AbstractModule(bot) {
         }
     }
 
-    override fun commandResponse(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+    override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         val hand = Hands.valueOf(cmd.uppercase())
         val botHand = Hands.values()[Random.nextInt(0, Hands.values().size)]
-        with(bot) {
-            send("${hand.emoji}  vs. ${botHand.emoji}")
+        with(event.bot()) {
+            sendIRC().message(channel, "${hand.emoji}  vs. ${botHand.emoji}")
             when {
                 hand == botHand -> {
-                    action("tied.")
+                    sendIRC().action(channel, "tied.")
                 }
                 hand.beats(botHand) -> {
-                    action("lost. ${hand.name.capitalise()} ${hand.action} ${botHand.name.lowercase()}.")
+                    sendIRC().action(
+                        channel,
+                        "lost. ${hand.name.capitalise()} ${hand.action} ${botHand.name.lowercase()}."
+                    )
                 }
                 else -> {
-                    action("wins. ${botHand.name.capitalise()} ${botHand.action} ${hand.name.lowercase()}.")
+                    sendIRC().action(
+                        channel,
+                        "wins. ${botHand.name.capitalise()} ${botHand.action} ${hand.name.lowercase()}."
+                    )
                 }
             }
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index f418185..230e2af 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -31,10 +31,10 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.encodeUrl
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.unescapeXml
 import net.thauvin.erik.mobibot.Utils.urlReader
 import net.thauvin.erik.mobibot.msg.ErrorMessage
@@ -43,31 +43,34 @@ import net.thauvin.erik.mobibot.msg.NoticeMessage
 import net.thauvin.erik.mobibot.msg.PublicMessage
 import org.json.JSONException
 import org.json.JSONObject
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.net.URL
 
 /**
  * The StockQuote module.
  */
-class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
+class StockQuote : ThreadedModule() {
+    private val logger: Logger = LoggerFactory.getLogger(StockQuote::class.java)
+
     /**
      * Returns the specified stock quote from Alpha Vantage.
      */
-    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        with(bot) {
-            if (args.isNotBlank()) {
-                try {
-                    val messages = getQuote(args, properties[ALPHAVANTAGE_API_KEY_PROP])
-                    for (msg in messages) {
-                        send(sender, msg)
-                    }
-                } catch (e: ModuleException) {
-                    if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                    send(e.message)
+    override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
+        if (args.isNotBlank()) {
+            try {
+                val messages = getQuote(args, properties[ALPHAVANTAGE_API_KEY_PROP])
+                for (msg in messages) {
+                    event.sendMessage(channel, msg)
                 }
-            } else {
-                helpResponse(sender, isPrivate)
+            } catch (e: ModuleException) {
+                if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
+                event.sendMessage(e.message!!)
             }
+        } else {
+            helpResponse(event)
         }
     }
 
@@ -129,9 +132,9 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                     "${STOCK_CMD.capitalise()} is disabled. The API key is missing."
                 )
             }
-            return if (symbol.isNotBlank()) {
+            val messages = mutableListOf<Message>()
+            if (symbol.isNotBlank()) {
                 val debugMessage = "getQuote($symbol)"
-                val messages = mutableListOf<Message>()
                 var response: String
                 try {
                     with(messages) {
@@ -161,56 +164,55 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                             val quote = json.getJSONObject("Global Quote")
                             if (quote.isEmpty) {
                                 add(ErrorMessage(INVALID_SYMBOL))
-                                return messages
-                            }
+                            } else {
 
-                            add(
-                                PublicMessage(
-                                    "Symbol: " + unescapeXml(quote.getString("01. symbol"))
-                                            + " [" + unescapeXml(symbolInfo.getString("2. name")) + ']'
+                                add(
+                                    PublicMessage(
+                                        "Symbol: " + unescapeXml(quote.getString("01. symbol"))
+                                                + " [" + unescapeXml(symbolInfo.getString("2. name")) + ']'
+                                    )
                                 )
-                            )
 
-                            @Suppress("MagicNumber")
-                            val pad = 10
+                                val pad = 10
 
-                            add(
-                                PublicMessage(
-                                    "Price:".padEnd(pad).prependIndent()
-                                            + unescapeXml(quote.getString("05. price"))
+                                add(
+                                    PublicMessage(
+                                        "Price:".padEnd(pad).prependIndent()
+                                                + unescapeXml(quote.getString("05. price"))
+                                    )
                                 )
-                            )
-                            add(
-                                PublicMessage(
-                                    "Previous:".padEnd(pad).prependIndent()
-                                            + unescapeXml(quote.getString("08. previous close"))
+                                add(
+                                    PublicMessage(
+                                        "Previous:".padEnd(pad).prependIndent()
+                                                + unescapeXml(quote.getString("08. previous close"))
+                                    )
                                 )
-                            )
 
-                            val data = arrayOf(
-                                "Open" to "02. open",
-                                "High" to "03. high",
-                                "Low" to "04. low",
-                                "Volume" to "06. volume",
-                                "Latest" to "07. latest trading day"
-                            )
+                                val data = arrayOf(
+                                    "Open" to "02. open",
+                                    "High" to "03. high",
+                                    "Low" to "04. low",
+                                    "Volume" to "06. volume",
+                                    "Latest" to "07. latest trading day"
+                                )
+
+                                data.forEach {
+                                    add(
+                                        NoticeMessage(
+                                            "${it.first}:".padEnd(pad).prependIndent()
+                                                    + unescapeXml(quote.getString(it.second))
+                                        )
+                                    )
+                                }
 
-                            data.forEach {
                                 add(
                                     NoticeMessage(
-                                        "${it.first}:".padEnd(pad).prependIndent()
-                                                + unescapeXml(quote.getString(it.second))
+                                        "Change:".padEnd(pad).prependIndent()
+                                                + unescapeXml(quote.getString("09. change"))
+                                                + " [" + unescapeXml(quote.getString("10. change percent")) + ']'
                                     )
                                 )
                             }
-
-                            add(
-                                NoticeMessage(
-                                    "Change:".padEnd(pad).prependIndent()
-                                            + unescapeXml(quote.getString("09. change"))
-                                            + " [" + unescapeXml(quote.getString("10. change percent")) + ']'
-                                )
-                            )
                         }
                     }
                 } catch (e: IOException) {
@@ -218,10 +220,10 @@ class StockQuote(bot: Mobibot) : ThreadedModule(bot) {
                 } catch (e: NullPointerException) {
                     throw ModuleException(debugMessage, "An error has occurred retrieving a stock quote.", e)
                 }
-                messages
             } else {
-                throw ModuleException(INVALID_SYMBOL)
+                messages.add(ErrorMessage(INVALID_SYMBOL))
             }
+            return messages
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
index d1d58d0..b44aab1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
@@ -33,36 +33,26 @@ package net.thauvin.erik.mobibot.modules
 
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import net.thauvin.erik.mobibot.Mobibot
+import org.pircbotx.hooks.types.GenericMessageEvent
 
 /**
  * The `ThreadedModule` class.
  */
-abstract class ThreadedModule(bot: Mobibot) : AbstractModule(bot) {
-    override fun commandResponse(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    ) {
-        if (isEnabled && args.isNotEmpty()) {
+abstract class ThreadedModule : AbstractModule() {
+    override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
+        if (isEnabled && event.message.isNotEmpty()) {
             runBlocking {
                 launch {
-                    run(sender, cmd, args, isPrivate)
+                    run(channel, cmd, args, event)
                 }
             }
         } else {
-            helpResponse(sender, isPrivate)
+            helpResponse(event)
         }
     }
 
     /**
      * Runs the thread.
      */
-    abstract fun run(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    )
+    abstract fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent)
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
index 17f2557..f6020e3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -34,21 +34,26 @@ package net.thauvin.erik.mobibot.modules
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import net.thauvin.erik.mobibot.Constants
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.TwitterTimer
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.commands.links.LinksMgr
 import net.thauvin.erik.mobibot.entries.EntriesUtils
-import net.thauvin.erik.mobibot.msg.Message
-import net.thauvin.erik.mobibot.msg.NoticeMessage
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import twitter4j.TwitterException
 import twitter4j.TwitterFactory
 import twitter4j.conf.ConfigurationBuilder
+import java.util.Timer
 
 /**
  * The Twitter module.
  */
-class Twitter(bot: Mobibot) : ThreadedModule(bot) {
+class Twitter : ThreadedModule() {
+    private val logger: Logger = LoggerFactory.getLogger(Twitter::class.java)
+
+    private val timer = Timer(true)
+
     // Twitter auto-posts.
     private val entries: MutableSet<Int> = HashSet()
 
@@ -87,16 +92,14 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
      * Send a notification to the registered Twitter handle.
      */
     fun notification(msg: String) {
-        with(bot) {
-            if (isEnabled && !handle.isNullOrBlank()) {
-                runBlocking {
-                    launch {
-                        try {
-                            post(message = msg, isDm = true)
-                            if (logger.isDebugEnabled) logger.debug("Notified @$handle: $msg")
-                        } catch (e: ModuleException) {
-                            if (logger.isWarnEnabled) logger.warn("Failed to notify @$handle: $msg", e)
-                        }
+        if (isEnabled && !handle.isNullOrBlank()) {
+            runBlocking {
+                launch {
+                    try {
+                        post(message = msg, isDm = true)
+                        if (logger.isDebugEnabled) logger.debug("Notified @$handle: $msg")
+                    } catch (e: ModuleException) {
+                        if (logger.isWarnEnabled) logger.warn("Failed to notify @$handle: $msg", e)
                     }
                 }
             }
@@ -107,7 +110,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
      * Posts on Twitter.
      */
     @Throws(ModuleException::class)
-    fun post(handle: String = "${properties[HANDLE_PROP]}", message: String, isDm: Boolean): Message {
+    fun post(handle: String = "${properties[HANDLE_PROP]}", message: String, isDm: Boolean): String {
         return twitterPost(
             properties[CONSUMER_KEY_PROP],
             properties[CONSUMER_SECRET_PROP],
@@ -123,35 +126,32 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
      * Post an entry to twitter.
      */
     fun postEntry(index: Int) {
-        with(bot) {
-            if (isAutoPost && hasEntry(index) && LinksMgr.entries.size >= index) {
-                val entry = LinksMgr.entries[index]
-                val msg = "${entry.title} ${entry.link} via ${entry.nick} on $channel"
-                runBlocking {
-                    launch {
-                        try {
-                            if (logger.isDebugEnabled) {
-                                logger.debug("Posting {} to Twitter.", EntriesUtils.buildLinkCmd(index))
-                            }
-                            post(message = msg, isDm = false)
-                        } catch (e: ModuleException) {
-                            if (logger.isWarnEnabled) logger.warn("Failed to post entry on Twitter.", e)
+        if (isAutoPost && hasEntry(index) && LinksMgr.entries.links.size >= index) {
+            val entry = LinksMgr.entries.links[index]
+            val msg = "${entry.title} ${entry.link} via ${entry.nick} on ${entry.channel}"
+            runBlocking {
+                launch {
+                    try {
+                        if (logger.isDebugEnabled) {
+                            logger.debug("Posting {} to Twitter.", EntriesUtils.buildLinkLabel(index))
                         }
+                        post(message = msg, isDm = false)
+                    } catch (e: ModuleException) {
+                        if (logger.isWarnEnabled) logger.warn("Failed to post entry on Twitter.", e)
                     }
                 }
-                removeEntry(index)
             }
+            removeEntry(index)
         }
     }
 
     fun queueEntry(index: Int) {
         if (isAutoPost) {
             addEntry(index)
-            if (bot.logger.isDebugEnabled) {
-                bot.logger.debug("Scheduling {} for posting on Twitter.", EntriesUtils.buildLinkCmd(index))
+            if (logger.isDebugEnabled) {
+                logger.debug("Scheduling {} for posting on Twitter.", EntriesUtils.buildLinkLabel(index))
             }
-            @Suppress("MagicNumber")
-            bot.timer.schedule(TwitterTimer(bot, index), Constants.TIMER_DELAY * 60L * 1000L)
+            timer.schedule(TwitterTimer(this, index), Constants.TIMER_DELAY * 60L * 1000L)
         }
     }
 
@@ -162,18 +162,12 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
     /**
      * Posts to twitter.
      */
-    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
-        with(bot) {
-            try {
-                send(
-                    sender,
-                    post(sender, "$args (by $sender on $channel)", false).msg,
-                    isPrivate
-                )
-            } catch (e: ModuleException) {
-                if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                send(sender, e.message, isPrivate)
-            }
+    override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
+        try {
+            event.respond(post(event.user.nick, "$args (by ${event.user.nick} on $channel)", false))
+        } catch (e: ModuleException) {
+            if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
+            event.respond(e.message)
         }
     }
 
@@ -181,6 +175,7 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
      * Post all the entries to Twitter on shutdown.
      */
     fun shutdown() {
+        timer.cancel()
         if (isAutoPost) {
             for (index in entries) {
                 postEntry(index)
@@ -213,23 +208,23 @@ class Twitter(bot: Mobibot) : ThreadedModule(bot) {
             handle: String?,
             message: String,
             isDm: Boolean
-        ): Message {
+        ): String {
             return try {
-                val cb = ConfigurationBuilder()
-                cb.setDebugEnabled(true)
-                    .setOAuthConsumerKey(consumerKey)
-                    .setOAuthConsumerSecret(consumerSecret)
-                    .setOAuthAccessToken(token).setOAuthAccessTokenSecret(tokenSecret)
+                val cb = ConfigurationBuilder().apply {
+                    setDebugEnabled(true)
+                    setOAuthConsumerKey(consumerKey)
+                    setOAuthConsumerSecret(consumerSecret)
+                    setOAuthAccessToken(token)
+                    setOAuthAccessTokenSecret(tokenSecret)
+                }
                 val tf = TwitterFactory(cb.build())
                 val twitter = tf.instance
                 if (!isDm) {
                     val status = twitter.updateStatus(message)
-                    NoticeMessage(
-                        "You message was posted to https://twitter.com/${twitter.screenName}/statuses/${status.id}"
-                    )
+                    "Your message was posted to https://twitter.com/${twitter.screenName}/statuses/${status.id}"
                 } else {
                     val dm = twitter.sendDirectMessage(handle, message)
-                    NoticeMessage(dm.text)
+                    dm.text
                 }
             } catch (e: TwitterException) {
                 throw ModuleException("twitterPost($message)", "An error has occurred: ${e.message}", e)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index ef6cb1f..1b2c525 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -35,45 +35,48 @@ import net.aksingh.owmjapis.api.APIException
 import net.aksingh.owmjapis.core.OWM
 import net.aksingh.owmjapis.core.OWM.Country
 import net.aksingh.owmjapis.model.CurrentWeather
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.capitalizeWords
 import net.thauvin.erik.mobibot.Utils.encodeUrl
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.msg.ErrorMessage
 import net.thauvin.erik.mobibot.msg.Message
 import net.thauvin.erik.mobibot.msg.NoticeMessage
 import net.thauvin.erik.mobibot.msg.PublicMessage
-import org.jibble.pircbot.Colors
+import org.pircbotx.Colors
+import org.pircbotx.hooks.types.GenericMessageEvent
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import kotlin.math.roundToInt
 
 /**
  * The `Weather2` module.
  */
-class Weather2(bot: Mobibot) : ThreadedModule(bot) {
+class Weather2 : ThreadedModule() {
+    private val logger: Logger = LoggerFactory.getLogger(Weather2::class.java)
+
     /**
      * Fetches the weather data from a specific city.
      */
-    override fun run(sender: String, cmd: String, args: String, isPrivate: Boolean) {
+    override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         if (args.isNotBlank()) {
-            with(bot) {
-                try {
-                    val messages = getWeather(args, properties[OWM_API_KEY_PROP])
-                    if (messages[0].isError) {
-                        helpResponse(sender, isPrivate)
-                    } else {
-                        for (msg in messages) {
-                            send(sender, msg)
-                        }
+            try {
+                val messages = getWeather(args, properties[OWM_API_KEY_PROP])
+                if (messages[0].isError) {
+                    helpResponse(event)
+                } else {
+                    for (msg in messages) {
+                        event.sendMessage(channel, msg)
                     }
-                } catch (e: ModuleException) {
-                    if (logger.isDebugEnabled) logger.debug(e.debugMessage, e)
-                    send(e.message)
                 }
+            } catch (e: ModuleException) {
+                if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
+                event.respond(e.message)
             }
         } else {
-            helpResponse(sender, isPrivate)
+            helpResponse(event)
         }
     }
 
@@ -90,7 +93,6 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
          * Converts and rounds temperature from °F to °C.
          */
         fun ftoC(d: Double?): Pair<Int, Int> {
-            @Suppress("MagicNumber")
             val c = (d!! - 32) * 5 / 9
             return d.roundToInt() to c.roundToInt()
         }
@@ -208,7 +210,6 @@ class Weather2(bot: Mobibot) : ThreadedModule(bot) {
          * Converts and rounds temperature from mph to km/h.
          */
         fun mphToKmh(w: Double): Pair<Int, Int> {
-            @Suppress("MagicNumber")
             val kmh = w * 1.60934
             return w.roundToInt() to kmh.roundToInt()
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index e4deddb..3105d97 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -31,12 +31,11 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Mobibot
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.msg.ErrorMessage
-import net.thauvin.erik.mobibot.msg.Message
-import net.thauvin.erik.mobibot.msg.PublicMessage
+import net.thauvin.erik.mobibot.Utils.sendList
+import net.thauvin.erik.mobibot.Utils.sendMessage
+import org.pircbotx.hooks.types.GenericMessageEvent
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
@@ -46,7 +45,7 @@ import java.util.Collections
 /**
  * The WorldTime module.
  */
-class WorldTime(bot: Mobibot) : AbstractModule(bot) {
+class WorldTime : AbstractModule() {
     companion object {
         // Beats (Internet Time) keyword
         const val BEATS_KEYWORD = ".beats"
@@ -57,6 +56,12 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         // The Time command
         private const val TIME_CMD = "time"
 
+        // The zones arguments
+        private const val ZONES_ARGS = "zones"
+
+        // The default zone
+        private const val DEFAULT_ZONE = "PST"
+
         // Date/Time Format
         private var dtf =
             DateTimeFormatter.ofPattern("'The time is ${bold("'HH:mm'")} on ${bold("'EEEE, d MMMM yyyy'")} in '")
@@ -64,342 +69,316 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
         /**
          * Returns the current Internet (beat) Time.
          */
-        @Suppress("MagicNumber", "ImplicitDefaultLocale")
         private fun internetTime(): String {
             val zdt = ZonedDateTime.now(ZoneId.of("UTC+01:00"))
             val beats = ((zdt[ChronoField.SECOND_OF_MINUTE] + zdt[ChronoField.MINUTE_OF_HOUR] * 60
                     + zdt[ChronoField.HOUR_OF_DAY] * 3600) / 86.4).toInt()
-            return String.format("%c%03d", '@', beats)
+            return "%c%03d".format('@', beats)
         }
 
         /**
          * Returns the time for the given timezone/city.
          */
         @JvmStatic
-        fun time(query: String): Message {
-            val tz = COUNTRIES_MAP[(query.substring(query.indexOf(' ') + 1).trim()).uppercase()]
-            val response: String = if (tz != null) {
+        fun time(query: String = DEFAULT_ZONE): String {
+            val tz = COUNTRIES_MAP[(if (query.isNotBlank()) query.trim().uppercase() else DEFAULT_ZONE)]
+            return if (tz != null) {
                 if (BEATS_KEYWORD == tz) {
-                    "The current Internet Time is: ${bold(internetTime())} $BEATS_KEYWORD"
+                    "The current Internet Time is ${bold(internetTime())} $BEATS_KEYWORD"
                 } else {
                     (ZonedDateTime.now().withZoneSameInstant(ZoneId.of(tz)).format(dtf)
                             + bold(tz.substring(tz.lastIndexOf('/') + 1).replace('_', ' ')))
                 }
             } else {
-                return ErrorMessage("Unsupported country/zone. Please try again.")
+                "Unsupported country/zone. Please try again."
             }
-            return PublicMessage(response)
         }
 
         init {
-            // Initialize the countries map
-            val countries = mutableMapOf<String, String>()
-            countries["AD"] = "Europe/Andorra"
-            countries["AE"] = "Asia/Dubai"
-            countries["AF"] = "Asia/Kabul"
-            countries["AG"] = "America/Antigua"
-            countries["AI"] = "America/Anguilla"
-            countries["AKDT"] = "America/Anchorage"
-            countries["AKST"] = "America/Anchorage"
-            countries["AL"] = "Europe/Tirane"
-            countries["AM"] = "Asia/Yerevan"
-            countries["AO"] = "Africa/Luanda"
-            countries["AQ"] = "Antarctica/South_Pole"
-            countries["AR"] = "America/Argentina/Buenos_Aires"
-            countries["AS"] = "Pacific/Pago_Pago"
-            countries["AT"] = "Europe/Vienna"
-            countries["AU"] = "Australia/Sydney"
-            countries["AW"] = "America/Aruba"
-            countries["AX"] = "Europe/Mariehamn"
-            countries["AZ"] = "Asia/Baku"
-            countries["BA"] = "Europe/Sarajevo"
-            countries["BB"] = "America/Barbados"
-            countries["BD"] = "Asia/Dhaka"
-            countries["BE"] = "Europe/Brussels"
-            countries["BEAT"] = BEATS_KEYWORD
-            countries["BF"] = "Africa/Ouagadougou"
-            countries["BG"] = "Europe/Sofia"
-            countries["BH"] = "Asia/Bahrain"
-            countries["BI"] = "Africa/Bujumbura"
-            countries["BJ"] = "Africa/Porto-Novo"
-            countries["BL"] = "America/St_Barthelemy"
-            countries["BM"] = "Atlantic/Bermuda"
-            countries["BMT"] = BEATS_KEYWORD
-            countries["BN"] = "Asia/Brunei"
-            countries["BO"] = "America/La_Paz"
-            countries["BQ"] = "America/Kralendijk"
-            countries["BR"] = "America/Sao_Paulo"
-            countries["BS"] = "America/Nassau"
-            countries["BT"] = "Asia/Thimphu"
-            countries["BW"] = "Africa/Gaborone"
-            countries["BY"] = "Europe/Minsk"
-            countries["BZ"] = "America/Belize"
-            countries["CA"] = "America/Montreal"
-            countries["CC"] = "Indian/Cocos"
-            countries["CD"] = "Africa/Kinshasa"
-            countries["CDT"] = "America/Chicago"
-            countries["CET"] = "CET"
-            countries["CF"] = "Africa/Bangui"
-            countries["CG"] = "Africa/Brazzaville"
-            countries["CH"] = "Europe/Zurich"
-            countries["CI"] = "Africa/Abidjan"
-            countries["CK"] = "Pacific/Rarotonga"
-            countries["CL"] = "America/Santiago"
-            countries["CM"] = "Africa/Douala"
-            countries["CN"] = "Asia/Shanghai"
-            countries["CO"] = "America/Bogota"
-            countries["CR"] = "America/Costa_Rica"
-            countries["CST"] = "America/Chicago"
-            countries["CU"] = "Cuba"
-            countries["CV"] = "Atlantic/Cape_Verde"
-            countries["CW"] = "America/Curacao"
-            countries["CX"] = "Indian/Christmas"
-            countries["CY"] = "Asia/Nicosia"
-            countries["CZ"] = "Europe/Prague"
-            countries["DE"] = "Europe/Berlin"
-            countries["DJ"] = "Africa/Djibouti"
-            countries["DK"] = "Europe/Copenhagen"
-            countries["DM"] = "America/Dominica"
-            countries["DO"] = "America/Santo_Domingo"
-            countries["DZ"] = "Africa/Algiers"
-            countries["EC"] = "Pacific/Galapagos"
-            countries["EDT"] = "America/New_York"
-            countries["EE"] = "Europe/Tallinn"
-            countries["EG"] = "Africa/Cairo"
-            countries["EH"] = "Africa/El_Aaiun"
-            countries["ER"] = "Africa/Asmara"
-            countries["ES"] = "Europe/Madrid"
-            countries["EST"] = "America/New_York"
-            countries["ET"] = "Africa/Addis_Ababa"
-            countries["FI"] = "Europe/Helsinki"
-            countries["FJ"] = "Pacific/Fiji"
-            countries["FK"] = "Atlantic/Stanley"
-            countries["FM"] = "Pacific/Yap"
-            countries["FO"] = "Atlantic/Faroe"
-            countries["FR"] = "Europe/Paris"
-            countries["GA"] = "Africa/Libreville"
-            countries["GB"] = "Europe/London"
-            countries["GD"] = "America/Grenada"
-            countries["GE"] = "Asia/Tbilisi"
-            countries["GF"] = "America/Cayenne"
-            countries["GG"] = "Europe/Guernsey"
-            countries["GH"] = "Africa/Accra"
-            countries["GI"] = "Europe/Gibraltar"
-            countries["GL"] = "America/Thule"
-            countries["GM"] = "Africa/Banjul"
-            countries["GMT"] = "GMT"
-            countries["GN"] = "Africa/Conakry"
-            countries["GP"] = "America/Guadeloupe"
-            countries["GQ"] = "Africa/Malabo"
-            countries["GR"] = "Europe/Athens"
-            countries["GS"] = "Atlantic/South_Georgia"
-            countries["GT"] = "America/Guatemala"
-            countries["GU"] = "Pacific/Guam"
-            countries["GW"] = "Africa/Bissau"
-            countries["GY"] = "America/Guyana"
-            countries["HK"] = "Asia/Hong_Kong"
-            countries["HN"] = "America/Tegucigalpa"
-            countries["HR"] = "Europe/Zagreb"
-            countries["HST"] = "Pacific/Honolulu"
-            countries["HT"] = "America/Port-au-Prince"
-            countries["HU"] = "Europe/Budapest"
-            countries["ID"] = "Asia/Jakarta"
-            countries["IE"] = "Europe/Dublin"
-            countries["IL"] = "Asia/Tel_Aviv"
-            countries["IM"] = "Europe/Isle_of_Man"
-            countries["IN"] = "Asia/Kolkata"
-            countries["IO"] = "Indian/Chagos"
-            countries["IQ"] = "Asia/Baghdad"
-            countries["IR"] = "Asia/Tehran"
-            countries["IS"] = "Atlantic/Reykjavik"
-            countries["IT"] = "Europe/Rome"
-            countries["JE"] = "Europe/Jersey"
-            countries["JM"] = "Jamaica"
-            countries["JO"] = "Asia/Amman"
-            countries["JP"] = "Asia/Tokyo"
-            countries["KE"] = "Africa/Nairobi"
-            countries["KG"] = "Asia/Bishkek"
-            countries["KH"] = "Asia/Phnom_Penh"
-            countries["KI"] = "Pacific/Tarawa"
-            countries["KM"] = "Indian/Comoro"
-            countries["KN"] = "America/St_Kitts"
-            countries["KP"] = "Asia/Pyongyang"
-            countries["KR"] = "Asia/Seoul"
-            countries["KW"] = "Asia/Riyadh"
-            countries["KY"] = "America/Cayman"
-            countries["KZ"] = "Asia/Oral"
-            countries["LA"] = "Asia/Vientiane"
-            countries["LB"] = "Asia/Beirut"
-            countries["LC"] = "America/St_Lucia"
-            countries["LI"] = "Europe/Vaduz"
-            countries["LK"] = "Asia/Colombo"
-            countries["LR"] = "Africa/Monrovia"
-            countries["LS"] = "Africa/Maseru"
-            countries["LT"] = "Europe/Vilnius"
-            countries["LU"] = "Europe/Luxembourg"
-            countries["LV"] = "Europe/Riga"
-            countries["LY"] = "Africa/Tripoli"
-            countries["MA"] = "Africa/Casablanca"
-            countries["MC"] = "Europe/Monaco"
-            countries["MD"] = "Europe/Chisinau"
-            countries["MDT"] = "America/Denver"
-            countries["ME"] = "Europe/Podgorica"
-            countries["MF"] = "America/Marigot"
-            countries["MG"] = "Indian/Antananarivo"
-            countries["MH"] = "Pacific/Majuro"
-            countries["MK"] = "Europe/Skopje"
-            countries["ML"] = "Africa/Timbuktu"
-            countries["MM"] = "Asia/Yangon"
-            countries["MN"] = "Asia/Ulaanbaatar"
-            countries["MO"] = "Asia/Macau"
-            countries["MP"] = "Pacific/Saipan"
-            countries["MQ"] = "America/Martinique"
-            countries["MR"] = "Africa/Nouakchott"
-            countries["MS"] = "America/Montserrat"
-            countries["MST"] = "America/Denver"
-            countries["MT"] = "Europe/Malta"
-            countries["MU"] = "Indian/Mauritius"
-            countries["MV"] = "Indian/Maldives"
-            countries["MW"] = "Africa/Blantyre"
-            countries["MX"] = "America/Mexico_City"
-            countries["MY"] = "Asia/Kuala_Lumpur"
-            countries["MZ"] = "Africa/Maputo"
-            countries["NA"] = "Africa/Windhoek"
-            countries["NC"] = "Pacific/Noumea"
-            countries["NE"] = "Africa/Niamey"
-            countries["NF"] = "Pacific/Norfolk"
-            countries["NG"] = "Africa/Lagos"
-            countries["NI"] = "America/Managua"
-            countries["NL"] = "Europe/Amsterdam"
-            countries["NO"] = "Europe/Oslo"
-            countries["NP"] = "Asia/Kathmandu"
-            countries["NR"] = "Pacific/Nauru"
-            countries["NU"] = "Pacific/Niue"
-            countries["NZ"] = "Pacific/Auckland"
-            countries["OM"] = "Asia/Muscat"
-            countries["PA"] = "America/Panama"
-            countries["PDT"] = "America/Los_Angeles"
-            countries["PE"] = "America/Lima"
-            countries["PF"] = "Pacific/Tahiti"
-            countries["PG"] = "Pacific/Port_Moresby"
-            countries["PH"] = "Asia/Manila"
-            countries["PK"] = "Asia/Karachi"
-            countries["PL"] = "Europe/Warsaw"
-            countries["PM"] = "America/Miquelon"
-            countries["PN"] = "Pacific/Pitcairn"
-            countries["PR"] = "America/Puerto_Rico"
-            countries["PS"] = "Asia/Gaza"
-            countries["PST"] = "America/Los_Angeles"
-            countries["PT"] = "Europe/Lisbon"
-            countries["PW"] = "Pacific/Palau"
-            countries["PY"] = "America/Asuncion"
-            countries["QA"] = "Asia/Qatar"
-            countries["RE"] = "Indian/Reunion"
-            countries["RO"] = "Europe/Bucharest"
-            countries["RS"] = "Europe/Belgrade"
-            countries["RU"] = "Europe/Moscow"
-            countries["RW"] = "Africa/Kigali"
-            countries["SA"] = "Asia/Riyadh"
-            countries["SB"] = "Pacific/Guadalcanal"
-            countries["SC"] = "Indian/Mahe"
-            countries["SD"] = "Africa/Khartoum"
-            countries["SE"] = "Europe/Stockholm"
-            countries["SG"] = "Asia/Singapore"
-            countries["SH"] = "Atlantic/St_Helena"
-            countries["SI"] = "Europe/Ljubljana"
-            countries["SJ"] = "Atlantic/Jan_Mayen"
-            countries["SK"] = "Europe/Bratislava"
-            countries["SL"] = "Africa/Freetown"
-            countries["SM"] = "Europe/San_Marino"
-            countries["SN"] = "Africa/Dakar"
-            countries["SO"] = "Africa/Mogadishu"
-            countries["SR"] = "America/Paramaribo"
-            countries["SS"] = "Africa/Juba"
-            countries["ST"] = "Africa/Sao_Tome"
-            countries["SV"] = "America/El_Salvador"
-            countries["SX"] = "America/Lower_Princes"
-            countries["SY"] = "Asia/Damascus"
-            countries["SZ"] = "Africa/Mbabane"
-            countries["TC"] = "America/Grand_Turk"
-            countries["TD"] = "Africa/Ndjamena"
-            countries["TF"] = "Indian/Kerguelen"
-            countries["TG"] = "Africa/Lome"
-            countries["TH"] = "Asia/Bangkok"
-            countries["TJ"] = "Asia/Dushanbe"
-            countries["TK"] = "Pacific/Fakaofo"
-            countries["TL"] = "Asia/Dili"
-            countries["TM"] = "Asia/Ashgabat"
-            countries["TN"] = "Africa/Tunis"
-            countries["TO"] = "Pacific/Tongatapu"
-            countries["TR"] = "Europe/Istanbul"
-            countries["TT"] = "America/Port_of_Spain"
-            countries["TV"] = "Pacific/Funafuti"
-            countries["TW"] = "Asia/Taipei"
-            countries["TZ"] = "Africa/Dar_es_Salaam"
-            countries["UA"] = "Europe/Kiev"
-            countries["UG"] = "Africa/Kampala"
-            countries["UK"] = "Europe/London"
-            countries["UM"] = "Pacific/Wake"
-            countries["US"] = "America/New_York"
-            countries["UTC"] = "UTC"
-            countries["UY"] = "America/Montevideo"
-            countries["UZ"] = "Asia/Tashkent"
-            countries["VA"] = "Europe/Vatican"
-            countries["VC"] = "America/St_Vincent"
-            countries["VE"] = "America/Caracas"
-            countries["VG"] = "America/Tortola"
-            countries["VI"] = "America/St_Thomas"
-            countries["VN"] = "Asia/Ho_Chi_Minh"
-            countries["VU"] = "Pacific/Efate"
-            countries["WF"] = "Pacific/Wallis"
-            countries["WS"] = "Pacific/Apia"
-            countries["YE"] = "Asia/Aden"
-            countries["YT"] = "Indian/Mayotte"
-            countries["ZA"] = "Africa/Johannesburg"
-            countries["ZM"] = "Africa/Lusaka"
-            countries["ZULU"] = "Zulu"
-            countries["ZW"] = "Africa/Harare"
-            @Suppress("MagicNumber")
+            // Initialize the zones map
+            val zones = mutableMapOf<String, String>()
+            zones["AD"] = "Europe/Andorra"
+            zones["AE"] = "Asia/Dubai"
+            zones["AF"] = "Asia/Kabul"
+            zones["AG"] = "America/Antigua"
+            zones["AI"] = "America/Anguilla"
+            zones["AKDT"] = "America/Anchorage"
+            zones["AKST"] = "America/Anchorage"
+            zones["AL"] = "Europe/Tirane"
+            zones["AM"] = "Asia/Yerevan"
+            zones["AO"] = "Africa/Luanda"
+            zones["AQ"] = "Antarctica/South_Pole"
+            zones["AR"] = "America/Argentina/Buenos_Aires"
+            zones["AS"] = "Pacific/Pago_Pago"
+            zones["AT"] = "Europe/Vienna"
+            zones["AU"] = "Australia/Sydney"
+            zones["AW"] = "America/Aruba"
+            zones["AX"] = "Europe/Mariehamn"
+            zones["AZ"] = "Asia/Baku"
+            zones["BA"] = "Europe/Sarajevo"
+            zones["BB"] = "America/Barbados"
+            zones["BD"] = "Asia/Dhaka"
+            zones["BE"] = "Europe/Brussels"
+            zones["BEAT"] = BEATS_KEYWORD
+            zones["BF"] = "Africa/Ouagadougou"
+            zones["BG"] = "Europe/Sofia"
+            zones["BH"] = "Asia/Bahrain"
+            zones["BI"] = "Africa/Bujumbura"
+            zones["BJ"] = "Africa/Porto-Novo"
+            zones["BL"] = "America/St_Barthelemy"
+            zones["BM"] = "Atlantic/Bermuda"
+            zones["BMT"] = BEATS_KEYWORD
+            zones["BN"] = "Asia/Brunei"
+            zones["BO"] = "America/La_Paz"
+            zones["BQ"] = "America/Kralendijk"
+            zones["BR"] = "America/Sao_Paulo"
+            zones["BS"] = "America/Nassau"
+            zones["BT"] = "Asia/Thimphu"
+            zones["BW"] = "Africa/Gaborone"
+            zones["BY"] = "Europe/Minsk"
+            zones["BZ"] = "America/Belize"
+            zones["CA"] = "America/Montreal"
+            zones["CC"] = "Indian/Cocos"
+            zones["CD"] = "Africa/Kinshasa"
+            zones["CDT"] = "America/Chicago"
+            zones["CET"] = "CET"
+            zones["CF"] = "Africa/Bangui"
+            zones["CG"] = "Africa/Brazzaville"
+            zones["CH"] = "Europe/Zurich"
+            zones["CI"] = "Africa/Abidjan"
+            zones["CK"] = "Pacific/Rarotonga"
+            zones["CL"] = "America/Santiago"
+            zones["CM"] = "Africa/Douala"
+            zones["CN"] = "Asia/Shanghai"
+            zones["CO"] = "America/Bogota"
+            zones["CR"] = "America/Costa_Rica"
+            zones["CST"] = "America/Chicago"
+            zones["CU"] = "Cuba"
+            zones["CV"] = "Atlantic/Cape_Verde"
+            zones["CW"] = "America/Curacao"
+            zones["CX"] = "Indian/Christmas"
+            zones["CY"] = "Asia/Nicosia"
+            zones["CZ"] = "Europe/Prague"
+            zones["DE"] = "Europe/Berlin"
+            zones["DJ"] = "Africa/Djibouti"
+            zones["DK"] = "Europe/Copenhagen"
+            zones["DM"] = "America/Dominica"
+            zones["DO"] = "America/Santo_Domingo"
+            zones["DZ"] = "Africa/Algiers"
+            zones["EC"] = "Pacific/Galapagos"
+            zones["EDT"] = "America/New_York"
+            zones["EE"] = "Europe/Tallinn"
+            zones["EG"] = "Africa/Cairo"
+            zones["EH"] = "Africa/El_Aaiun"
+            zones["ER"] = "Africa/Asmara"
+            zones["ES"] = "Europe/Madrid"
+            zones["EST"] = "America/New_York"
+            zones["ET"] = "Africa/Addis_Ababa"
+            zones["FI"] = "Europe/Helsinki"
+            zones["FJ"] = "Pacific/Fiji"
+            zones["FK"] = "Atlantic/Stanley"
+            zones["FM"] = "Pacific/Yap"
+            zones["FO"] = "Atlantic/Faroe"
+            zones["FR"] = "Europe/Paris"
+            zones["GA"] = "Africa/Libreville"
+            zones["GB"] = "Europe/London"
+            zones["GD"] = "America/Grenada"
+            zones["GE"] = "Asia/Tbilisi"
+            zones["GF"] = "America/Cayenne"
+            zones["GG"] = "Europe/Guernsey"
+            zones["GH"] = "Africa/Accra"
+            zones["GI"] = "Europe/Gibraltar"
+            zones["GL"] = "America/Thule"
+            zones["GM"] = "Africa/Banjul"
+            zones["GMT"] = "GMT"
+            zones["GN"] = "Africa/Conakry"
+            zones["GP"] = "America/Guadeloupe"
+            zones["GQ"] = "Africa/Malabo"
+            zones["GR"] = "Europe/Athens"
+            zones["GS"] = "Atlantic/South_Georgia"
+            zones["GT"] = "America/Guatemala"
+            zones["GU"] = "Pacific/Guam"
+            zones["GW"] = "Africa/Bissau"
+            zones["GY"] = "America/Guyana"
+            zones["HK"] = "Asia/Hong_Kong"
+            zones["HN"] = "America/Tegucigalpa"
+            zones["HR"] = "Europe/Zagreb"
+            zones["HST"] = "Pacific/Honolulu"
+            zones["HT"] = "America/Port-au-Prince"
+            zones["HU"] = "Europe/Budapest"
+            zones["ID"] = "Asia/Jakarta"
+            zones["IE"] = "Europe/Dublin"
+            zones["IL"] = "Asia/Tel_Aviv"
+            zones["IM"] = "Europe/Isle_of_Man"
+            zones["IN"] = "Asia/Kolkata"
+            zones["IO"] = "Indian/Chagos"
+            zones["IQ"] = "Asia/Baghdad"
+            zones["IR"] = "Asia/Tehran"
+            zones["IS"] = "Atlantic/Reykjavik"
+            zones["IT"] = "Europe/Rome"
+            zones["JE"] = "Europe/Jersey"
+            zones["JM"] = "Jamaica"
+            zones["JO"] = "Asia/Amman"
+            zones["JP"] = "Asia/Tokyo"
+            zones["KE"] = "Africa/Nairobi"
+            zones["KG"] = "Asia/Bishkek"
+            zones["KH"] = "Asia/Phnom_Penh"
+            zones["KI"] = "Pacific/Tarawa"
+            zones["KM"] = "Indian/Comoro"
+            zones["KN"] = "America/St_Kitts"
+            zones["KP"] = "Asia/Pyongyang"
+            zones["KR"] = "Asia/Seoul"
+            zones["KW"] = "Asia/Riyadh"
+            zones["KY"] = "America/Cayman"
+            zones["KZ"] = "Asia/Oral"
+            zones["LA"] = "Asia/Vientiane"
+            zones["LB"] = "Asia/Beirut"
+            zones["LC"] = "America/St_Lucia"
+            zones["LI"] = "Europe/Vaduz"
+            zones["LK"] = "Asia/Colombo"
+            zones["LR"] = "Africa/Monrovia"
+            zones["LS"] = "Africa/Maseru"
+            zones["LT"] = "Europe/Vilnius"
+            zones["LU"] = "Europe/Luxembourg"
+            zones["LV"] = "Europe/Riga"
+            zones["LY"] = "Africa/Tripoli"
+            zones["MA"] = "Africa/Casablanca"
+            zones["MC"] = "Europe/Monaco"
+            zones["MD"] = "Europe/Chisinau"
+            zones["MDT"] = "America/Denver"
+            zones["ME"] = "Europe/Podgorica"
+            zones["MF"] = "America/Marigot"
+            zones["MG"] = "Indian/Antananarivo"
+            zones["MH"] = "Pacific/Majuro"
+            zones["MK"] = "Europe/Skopje"
+            zones["ML"] = "Africa/Timbuktu"
+            zones["MM"] = "Asia/Yangon"
+            zones["MN"] = "Asia/Ulaanbaatar"
+            zones["MO"] = "Asia/Macau"
+            zones["MP"] = "Pacific/Saipan"
+            zones["MQ"] = "America/Martinique"
+            zones["MR"] = "Africa/Nouakchott"
+            zones["MS"] = "America/Montserrat"
+            zones["MST"] = "America/Denver"
+            zones["MT"] = "Europe/Malta"
+            zones["MU"] = "Indian/Mauritius"
+            zones["MV"] = "Indian/Maldives"
+            zones["MW"] = "Africa/Blantyre"
+            zones["MX"] = "America/Mexico_City"
+            zones["MY"] = "Asia/Kuala_Lumpur"
+            zones["MZ"] = "Africa/Maputo"
+            zones["NA"] = "Africa/Windhoek"
+            zones["NC"] = "Pacific/Noumea"
+            zones["NE"] = "Africa/Niamey"
+            zones["NF"] = "Pacific/Norfolk"
+            zones["NG"] = "Africa/Lagos"
+            zones["NI"] = "America/Managua"
+            zones["NL"] = "Europe/Amsterdam"
+            zones["NO"] = "Europe/Oslo"
+            zones["NP"] = "Asia/Kathmandu"
+            zones["NR"] = "Pacific/Nauru"
+            zones["NU"] = "Pacific/Niue"
+            zones["NZ"] = "Pacific/Auckland"
+            zones["OM"] = "Asia/Muscat"
+            zones["PA"] = "America/Panama"
+            zones["PDT"] = "America/Los_Angeles"
+            zones["PE"] = "America/Lima"
+            zones["PF"] = "Pacific/Tahiti"
+            zones["PG"] = "Pacific/Port_Moresby"
+            zones["PH"] = "Asia/Manila"
+            zones["PK"] = "Asia/Karachi"
+            zones["PL"] = "Europe/Warsaw"
+            zones["PM"] = "America/Miquelon"
+            zones["PN"] = "Pacific/Pitcairn"
+            zones["PR"] = "America/Puerto_Rico"
+            zones["PS"] = "Asia/Gaza"
+            zones["PST"] = "America/Los_Angeles"
+            zones["PT"] = "Europe/Lisbon"
+            zones["PW"] = "Pacific/Palau"
+            zones["PY"] = "America/Asuncion"
+            zones["QA"] = "Asia/Qatar"
+            zones["RE"] = "Indian/Reunion"
+            zones["RO"] = "Europe/Bucharest"
+            zones["RS"] = "Europe/Belgrade"
+            zones["RU"] = "Europe/Moscow"
+            zones["RW"] = "Africa/Kigali"
+            zones["SA"] = "Asia/Riyadh"
+            zones["SB"] = "Pacific/Guadalcanal"
+            zones["SC"] = "Indian/Mahe"
+            zones["SD"] = "Africa/Khartoum"
+            zones["SE"] = "Europe/Stockholm"
+            zones["SG"] = "Asia/Singapore"
+            zones["SH"] = "Atlantic/St_Helena"
+            zones["SI"] = "Europe/Ljubljana"
+            zones["SJ"] = "Atlantic/Jan_Mayen"
+            zones["SK"] = "Europe/Bratislava"
+            zones["SL"] = "Africa/Freetown"
+            zones["SM"] = "Europe/San_Marino"
+            zones["SN"] = "Africa/Dakar"
+            zones["SO"] = "Africa/Mogadishu"
+            zones["SR"] = "America/Paramaribo"
+            zones["SS"] = "Africa/Juba"
+            zones["ST"] = "Africa/Sao_Tome"
+            zones["SV"] = "America/El_Salvador"
+            zones["SX"] = "America/Lower_Princes"
+            zones["SY"] = "Asia/Damascus"
+            zones["SZ"] = "Africa/Mbabane"
+            zones["TC"] = "America/Grand_Turk"
+            zones["TD"] = "Africa/Ndjamena"
+            zones["TF"] = "Indian/Kerguelen"
+            zones["TG"] = "Africa/Lome"
+            zones["TH"] = "Asia/Bangkok"
+            zones["TJ"] = "Asia/Dushanbe"
+            zones["TK"] = "Pacific/Fakaofo"
+            zones["TL"] = "Asia/Dili"
+            zones["TM"] = "Asia/Ashgabat"
+            zones["TN"] = "Africa/Tunis"
+            zones["TO"] = "Pacific/Tongatapu"
+            zones["TR"] = "Europe/Istanbul"
+            zones["TT"] = "America/Port_of_Spain"
+            zones["TV"] = "Pacific/Funafuti"
+            zones["TW"] = "Asia/Taipei"
+            zones["TZ"] = "Africa/Dar_es_Salaam"
+            zones["UA"] = "Europe/Kiev"
+            zones["UG"] = "Africa/Kampala"
+            zones["UK"] = "Europe/London"
+            zones["UM"] = "Pacific/Wake"
+            zones["US"] = "America/New_York"
+            zones["UTC"] = "UTC"
+            zones["UY"] = "America/Montevideo"
+            zones["UZ"] = "Asia/Tashkent"
+            zones["VA"] = "Europe/Vatican"
+            zones["VC"] = "America/St_Vincent"
+            zones["VE"] = "America/Caracas"
+            zones["VG"] = "America/Tortola"
+            zones["VI"] = "America/St_Thomas"
+            zones["VN"] = "Asia/Ho_Chi_Minh"
+            zones["VU"] = "Pacific/Efate"
+            zones["WF"] = "Pacific/Wallis"
+            zones["WS"] = "Pacific/Apia"
+            zones["YE"] = "Asia/Aden"
+            zones["YT"] = "Indian/Mayotte"
+            zones["ZA"] = "Africa/Johannesburg"
+            zones["ZM"] = "Africa/Lusaka"
+            zones["ZULU"] = "Zulu"
+            zones["ZW"] = "Africa/Harare"
             ZoneId.getAvailableZoneIds().stream()
                 .filter { tz: String ->
-                    tz.length <= 3 && !countries.containsKey(tz)
+                    tz.length <= 3 && !zones.containsKey(tz)
                 }
                 .forEach { tz: String ->
-                    countries[tz] = tz
+                    zones[tz] = tz
                 }
-            COUNTRIES_MAP = Collections.unmodifiableMap(countries)
+            COUNTRIES_MAP = Collections.unmodifiableMap(zones)
         }
     }
 
-    override fun commandResponse(
-        sender: String,
-        cmd: String,
-        args: String,
-        isPrivate: Boolean
-    ) {
-        with(bot) {
-            if (args.isEmpty()) {
-                send(sender, "The supported countries/zones are: ", isPrivate)
-                @Suppress("MagicNumber")
-                sendList(
-                    sender,
-                    COUNTRIES_MAP.keys.sorted().map { it.padEnd(4) },
-                    14,
-                    isPrivate = false,
-                    isIndent = true
-                )
-            } else {
-                val msg = time(args)
-                if (isPrivate) {
-                    send(sender, msg.msg, true)
-                } else {
-                    if (msg.isError) {
-                        send(sender, msg.msg, false)
-                    } else {
-                        send(msg.msg)
-                    }
-                }
-            }
+    override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
+        if (args.equals(ZONES_ARGS, true)) {
+            event.sendMessage("The supported countries/zones are: ")
+            event.sendList(COUNTRIES_MAP.keys.sorted().map { it.padEnd(4) }, 14, isIndent = true)
+        } else {
+            event.respond(time(args))
         }
     }
 
@@ -408,9 +387,9 @@ class WorldTime(bot: Mobibot) : AbstractModule(bot) {
     init {
         with(help) {
             add("To display a country's current date/time:")
-            add(helpFormat("%c $TIME_CMD <country code>"))
-            add("For a listing of the supported countries:")
-            add(helpFormat("%c $TIME_CMD"))
+            add(helpFormat("%c $TIME_CMD [<country code or zone>]"))
+            add("For a listing of the supported countries/zones:")
+            add(helpFormat("%c $TIME_CMD $ZONES_ARGS"))
         }
         commands.add(TIME_CMD)
     }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt b/src/test/kotlin/net/thauvin/erik/mobibot/ExceptionSanitizer.kt
similarity index 82%
rename from src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/ExceptionSanitizer.kt
index e8cc448..1660df7 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/Sanitize.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/ExceptionSanitizer.kt
@@ -1,5 +1,5 @@
 /*
- * Sanitize.kt
+ * ExceptionSanitizer.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -36,27 +36,26 @@ import net.thauvin.erik.mobibot.Utils.obfuscate
 import net.thauvin.erik.mobibot.Utils.replaceEach
 import net.thauvin.erik.mobibot.modules.ModuleException
 
-object Sanitize {
+object ExceptionSanitizer {
     /**
      * Returns a sanitized exception to avoid displaying api keys, etc. in CI logs.
      */
-    fun sanitizeException(e: ModuleException, vararg sanitize: String): ModuleException {
-        var sanitizedException = e
+    fun ModuleException.sanitize(vararg sanitize: String): ModuleException {
         val search = sanitize.filter { it.isNotBlank() }.toTypedArray()
         if (search.isNotEmpty()) {
             val obfuscate = search.map { it.obfuscate() }.toTypedArray()
-            with(e) {
-                if (cause?.message != null) {
-                    sanitizedException = ModuleException(
+            with(this) {
+                if (!cause?.message.isNullOrBlank()) {
+                    return ModuleException(
                         debugMessage,
                         cause!!.javaClass.name + ": " + cause!!.message!!.replaceEach(search, obfuscate),
                         this
                     )
-                } else if (message != null) {
-                    sanitizedException = ModuleException(debugMessage, message!!.replaceEach(search, obfuscate), this)
+                } else if (!message.isNullOrBlank()) {
+                    return ModuleException(debugMessage, message!!.replaceEach(search, obfuscate), this)
                 }
             }
         }
-        return sanitizedException
+        return this
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
index 234f84b..dadf542 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
@@ -31,12 +31,14 @@
  */
 package net.thauvin.erik.mobibot
 
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
+import assertk.assertions.isInstanceOf
 import com.rometools.rome.io.FeedException
 import net.thauvin.erik.mobibot.FeedReader.Companion.readFeed
-import org.assertj.core.api.Assertions.assertThat
-import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
-
 import java.io.FileNotFoundException
 import java.net.MalformedURLException
 import java.net.UnknownHostException
@@ -48,26 +50,24 @@ class FeedReaderTest {
     @Test
     fun readFeedTest() {
         var messages = readFeed("https://feeds.thauvin.net/ethauvin")
-        assertThat(messages.size).describedAs("messages = 10").isEqualTo(10)
-        assertThat(messages[1].msg).describedAs("feed entry url").contains("ethauvin")
+        assertThat(messages.size, "size = 10").isEqualTo(10)
+        assertThat(messages[1].msg, "feed entry url").contains("ethauvin")
 
         messages = readFeed("https://lorem-rss.herokuapp.com/feed?length=0")
-        assertThat(messages[0].msg).describedAs("nothing to view").contains("nothing")
+        assertThat(messages[0].msg, "nothing to view").contains("nothing")
 
         messages = readFeed("https://lorem-rss.herokuapp.com/feed?length=42", 42)
-        assertThat(messages.size).describedAs("messages = 84").isEqualTo(84)
-        assertThat(messages.last().msg).describedAs("example entry url").contains("http://example.com/test/")
+        assertThat(messages.size, "messages = 84").isEqualTo(84)
+        assertThat(messages.last().msg, "example entry url").contains("http://example.com/test/")
 
-        assertThatThrownBy { readFeed("blah") }.describedAs("invalid URL")
-            .isInstanceOf(MalformedURLException::class.java)
+        assertThat { readFeed("blah") }.isFailure().isInstanceOf(MalformedURLException::class.java)
 
-        assertThatThrownBy { readFeed("https://www.example.com") }.describedAs("not a feed")
-            .isInstanceOf(FeedException::class.java)
+        assertThat { readFeed("https://www.example.com") }.isFailure().isInstanceOf(FeedException::class.java)
 
-        assertThatThrownBy { readFeed("https://www.examples.com/foo") }.describedAs("404 not found")
+        assertThat { readFeed("https://www.examples.com/foo") }.isFailure()
             .isInstanceOf(FileNotFoundException::class.java)
 
-        assertThatThrownBy { readFeed("https://www.doesnotexists.com") }.describedAs("unknown host")
+        assertThat { readFeed("https://www.doesnotexists.com") }.isFailure()
             .isInstanceOf(UnknownHostException::class.java)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardTest.kt
similarity index 81%
rename from src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
rename to src/test/kotlin/net/thauvin/erik/mobibot/PinboardTest.kt
index 93ff940..76b5b95 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardTest.kt
@@ -1,5 +1,5 @@
 /*
- * PinboardUtilsTest.kt
+ * PinboardTest.kt
  *
  * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
@@ -32,45 +32,39 @@
 
 package net.thauvin.erik.mobibot
 
-import net.thauvin.erik.mobibot.PinboardUtils.toTimestamp
 import net.thauvin.erik.mobibot.entries.EntryLink
-import net.thauvin.erik.pinboard.PinboardPoster
 import org.testng.Assert.assertFalse
 import org.testng.Assert.assertTrue
 import org.testng.annotations.Test
 import java.net.URL
-import java.util.Date
 
-class PinboardUtilsTest : LocalProperties() {
+class PinboardTest : LocalProperties() {
+    private val pinboard = Pinboard()
+
     @Test
-    fun pinboardTest() {
+    fun testPinboard() {
         val apiToken = getProperty("pinboard-api-token")
-        val pinboard = PinboardPoster(apiToken)
         val url = "https://www.example.com/"
         val ircServer = "irc.test.com"
         val entry = EntryLink(url, "Test Example", "ErikT", "", "#mobitopia", listOf("test"))
 
-        PinboardUtils.addPin(pinboard, ircServer, entry)
+        pinboard.setApiToken(apiToken)
+
+        pinboard.addPin(ircServer, entry)
         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)
+        pinboard.updatePin(ircServer, url, entry)
         assertTrue(validatePin(apiToken, url = entry.link, ircServer), "validate update")
 
         entry.title = "Foo Title"
-        PinboardUtils.updatePin(pinboard, ircServer, entry.link, entry)
+        pinboard.updatePin(ircServer, entry.link, entry)
         assertTrue(validatePin(apiToken, url = entry.link, entry.title), "validate title")
 
-        PinboardUtils.deletePin(pinboard, entry)
+        pinboard.deletePin(entry)
         assertFalse(validatePin(apiToken, url = entry.link), "validate delete")
     }
 
-    @Test
-    fun toTimestampTest() {
-        val d = Date()
-        assertTrue(d.toTimestamp().matches("[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z".toRegex()))
-    }
-
     private fun validatePin(apiToken: String, url: String, vararg matches: String): Boolean {
         val response = Utils.urlReader(
             URL(
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 2dc0ef8..fc8f117 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -31,6 +31,8 @@
  */
 package net.thauvin.erik.mobibot
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import net.thauvin.erik.mobibot.Utils.appendIfMissing
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
@@ -55,8 +57,7 @@ import net.thauvin.erik.mobibot.Utils.unescapeXml
 import net.thauvin.erik.mobibot.Utils.uptime
 import net.thauvin.erik.mobibot.Utils.urlReader
 import net.thauvin.erik.mobibot.msg.Message.Companion.DEFAULT_COLOR
-import org.assertj.core.api.Assertions.assertThat
-import org.jibble.pircbot.Colors
+import org.pircbotx.Colors
 import org.testng.annotations.BeforeClass
 import org.testng.annotations.Test
 import java.io.File
@@ -86,59 +87,59 @@ class UtilsTest {
         val dir = "dir"
         val sep = '/'
         val url = "https://erik.thauvin.net"
-        assertThat(dir.appendIfMissing(File.separatorChar)).describedAs("appendIfMissing(dir)")
+        assertThat(dir.appendIfMissing(File.separatorChar), "appendIfMissing(dir)")
             .isEqualTo(dir + File.separatorChar)
-        assertThat(url.appendIfMissing(sep)).describedAs("appendIfMissing(url)").isEqualTo("$url$sep")
-        assertThat("$url$sep".appendIfMissing(sep)).describedAs("appendIfMissing($url$sep)").isEqualTo("$url$sep")
+        assertThat(url.appendIfMissing(sep), "appendIfMissing(url)").isEqualTo("$url$sep")
+        assertThat("$url$sep".appendIfMissing(sep), "appendIfMissing($url$sep)").isEqualTo("$url$sep")
     }
 
     @Test
     fun testBold() {
-        assertThat(bold(1)).describedAs("bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
-        assertThat(bold(2L)).describedAs("bold(1)").isEqualTo(Colors.BOLD + "2" + Colors.BOLD)
-        assertThat(bold(ascii)).describedAs("bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
-        assertThat(bold("test")).describedAs("bold(test)").isEqualTo(Colors.BOLD + "test" + Colors.BOLD)
+        assertThat(bold(1), "bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
+        assertThat(bold(2L), "bold(1)").isEqualTo(Colors.BOLD + "2" + Colors.BOLD)
+        assertThat(bold(ascii), "bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+        assertThat(bold("test"), "bold(test)").isEqualTo(Colors.BOLD + "test" + Colors.BOLD)
     }
 
     @Test
     fun testBuildCmdSyntax() {
         val bot = "mobibot"
-        assertThat(buildCmdSyntax("%c $test %n $test", bot, false)).describedAs("public")
+        assertThat(buildCmdSyntax("%c $test %n $test", bot, false), "public")
             .isEqualTo("$bot: $test $bot $test")
-        assertThat(buildCmdSyntax("%c %n $test %c $test %n", bot, true)).describedAs("public")
+        assertThat(buildCmdSyntax("%c %n $test %c $test %n", bot, true), "public")
             .isEqualTo("/msg $bot $bot $test /msg $bot $test $bot")
     }
 
 
     @Test
     fun testCapitalise() {
-        assertThat("test".capitalise()).describedAs("capitalize(test)").isEqualTo("Test")
-        assertThat("Test".capitalise()).describedAs("capitalize(Test)").isEqualTo("Test")
-        assertThat(test.capitalise()).describedAs("capitalize($test)").isEqualTo(test)
-        assertThat("".capitalise()).describedAs("capitalize()").isEqualTo("")
+        assertThat("test".capitalise(), "capitalize(test)").isEqualTo("Test")
+        assertThat("Test".capitalise(), "capitalize(Test)").isEqualTo("Test")
+        assertThat(test.capitalise(), "capitalize($test)").isEqualTo(test)
+        assertThat("".capitalise(), "capitalize()").isEqualTo("")
     }
 
     @Test
     fun textCapitaliseWords() {
-        assertThat(test.capitalizeWords()).describedAs("captiatlizeWords(test)").isEqualTo("This Is A Test.")
-        assertThat("Already Capitalized".capitalizeWords()).describedAs("already capitalized")
+        assertThat(test.capitalizeWords(), "captiatlizeWords(test)").isEqualTo("This Is A Test.")
+        assertThat("Already Capitalized".capitalizeWords(), "already capitalized")
             .isEqualTo("Already Capitalized")
-        assertThat("    a  test  ".capitalizeWords()).describedAs("with spaces").isEqualTo("    A  Test  ")
+        assertThat("    a  test  ".capitalizeWords(), "with spaces").isEqualTo("    A  Test  ")
     }
 
     @Test
     fun testColorize() {
-        assertThat(colorize(ascii, Colors.REVERSE)).describedAs("colorize(reverse)").isEqualTo(
+        assertThat(colorize(ascii, Colors.REVERSE), "colorize(reverse)").isEqualTo(
             Colors.REVERSE + ascii + Colors.REVERSE
         )
-        assertThat(colorize(ascii, Colors.RED)).describedAs("colorize(red)")
+        assertThat(colorize(ascii, Colors.RED), "colorize(red)")
             .isEqualTo(Colors.RED + ascii + Colors.NORMAL)
-        assertThat(colorize(ascii, Colors.BOLD)).describedAs("colorized(bold)")
+        assertThat(colorize(ascii, Colors.BOLD), "colorized(bold)")
             .isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
-        assertThat(colorize(null, Colors.RED)).describedAs("colorize(null)").isEqualTo("")
-        assertThat(colorize("", Colors.RED)).describedAs("colorize()").isEqualTo("")
-        assertThat(colorize(ascii, DEFAULT_COLOR)).describedAs("colorize(none)").isEqualTo(ascii)
-        assertThat(colorize("   ", Colors.NORMAL)).describedAs("colorize(blank)")
+        assertThat(colorize(null, Colors.RED), "colorize(null)").isEqualTo("")
+        assertThat(colorize("", Colors.RED), "colorize()").isEqualTo("")
+        assertThat(colorize(ascii, DEFAULT_COLOR), "colorize(none)").isEqualTo(ascii)
+        assertThat(colorize("   ", Colors.NORMAL), "colorize(blank)")
             .isEqualTo(Colors.NORMAL + "   " + Colors.NORMAL)
     }
 
@@ -157,9 +158,9 @@ class UtilsTest {
         val p = Properties()
         p["one"] = "1"
         p["two"] = "two"
-        assertThat(p.getIntProperty("one", 9)).describedAs("getIntProperty(one)").isEqualTo(1)
-        assertThat(p.getIntProperty("two", 2)).describedAs("getIntProperty(two)").isEqualTo(2)
-        assertThat(p.getIntProperty("foo", 3)).describedAs("getIntProperty(foo)").isEqualTo(3)
+        assertThat(p.getIntProperty("one", 9), "getIntProperty(one)").isEqualTo(1)
+        assertThat(p.getIntProperty("two", 2), "getIntProperty(two)").isEqualTo(2)
+        assertThat(p.getIntProperty("foo", 3), "getIntProperty(foo)").isEqualTo(3)
     }
 
     @Test
@@ -169,26 +170,26 @@ class UtilsTest {
 
     @Test
     fun testHelpFormat() {
-        assertThat(helpFormat(test, isBold = true, isIndent = false)).describedAs("bold")
+        assertThat(helpFormat(test, isBold = true, isIndent = false), "bold")
             .isEqualTo("${Colors.BOLD}$test${Colors.BOLD}")
-        assertThat(helpFormat(test, isBold = false, isIndent = true)).describedAs("indent")
+        assertThat(helpFormat(test, isBold = false, isIndent = true), "indent")
             .isEqualTo(test.prependIndent())
-        assertThat(helpFormat(test, isBold = true, isIndent = true)).describedAs("bold-indent")
+        assertThat(helpFormat(test, isBold = true, isIndent = true), "bold-indent")
             .isEqualTo(colorize(test, Colors.BOLD).prependIndent())
 
     }
 
     @Test
     fun testIsoLocalDate() {
-        assertThat(cal.time.toIsoLocalDate()).describedAs("isoLocalDate(date)").isEqualTo("1952-02-17")
-        assertThat(localDateTime.toIsoLocalDate()).describedAs("isoLocalDate(localDate)").isEqualTo("1952-02-17")
+        assertThat(cal.time.toIsoLocalDate(), "isoLocalDate(date)").isEqualTo("1952-02-17")
+        assertThat(localDateTime.toIsoLocalDate(), "isoLocalDate(localDate)").isEqualTo("1952-02-17")
     }
 
     @Test
     fun testObfuscate() {
-        assertThat(ascii.obfuscate().length).describedAs("obfuscate is right length").isEqualTo(ascii.length)
-        assertThat(ascii.obfuscate()).describedAs("obfuscate()").isEqualTo("x".repeat(ascii.length))
-        assertThat(" ".obfuscate()).describedAs("obfuscate(blank)").isEqualTo(" ")
+        assertThat(ascii.obfuscate().length, "obfuscate is right length").isEqualTo(ascii.length)
+        assertThat(ascii.obfuscate(), "obfuscate()").isEqualTo("x".repeat(ascii.length))
+        assertThat(" ".obfuscate(), "obfuscate(blank)").isEqualTo(" ")
     }
 
     @Test
@@ -197,7 +198,7 @@ class UtilsTest {
         val weeks = "weeks"
 
         for (i in -1..3) {
-            assertThat(week.plural(i.toLong())).describedAs("plural($i)").isEqualTo(if (i > 1) weeks else week)
+            assertThat(week.plural(i.toLong()), "plural($i)").isEqualTo(if (i > 1) weeks else week)
         }
     }
 
@@ -205,15 +206,15 @@ class UtilsTest {
     fun testReplaceEach() {
         val search = arrayOf("one", "two", "three")
         val replace = arrayOf("1", "2", "3")
-        assertThat(search.joinToString(",").replaceEach(search, replace)).describedAs("replaceEach(1,2,3")
+        assertThat(search.joinToString(",").replaceEach(search, replace), "replaceEach(1,2,3")
             .isEqualTo(replace.joinToString(","))
 
-        assertThat(test.replaceEach(search, replace)).describedAs("replaceEach(nothing)").isEqualTo(test)
+        assertThat(test.replaceEach(search, replace), "replaceEach(nothing)").isEqualTo(test)
 
-        assertThat(test.replaceEach(arrayOf("t", "e"), arrayOf("", "E"))).describedAs("replaceEach($test)")
+        assertThat(test.replaceEach(arrayOf("t", "e"), arrayOf("", "E")), "replaceEach($test)")
             .isEqualTo(test.replace("t", "").replace("e", "E"))
 
-        assertThat(test.replaceEach(search, emptyArray())).describedAs("replaceEach(search, empty)")
+        assertThat(test.replaceEach(search, emptyArray()), "replaceEach(search, empty)")
             .isEqualTo(test)
     }
 
@@ -234,8 +235,8 @@ class UtilsTest {
 
     @Test
     fun testToIntOrDefault() {
-        assertThat("10".toIntOrDefault(1)).describedAs("toIntOrDefault(10, 1)").isEqualTo(10)
-        assertThat("a".toIntOrDefault(2)).describedAs("toIntOrDefault(a, 2)").isEqualTo(2)
+        assertThat("10".toIntOrDefault(1), "toIntOrDefault(10, 1)").isEqualTo(10)
+        assertThat("a".toIntOrDefault(2), "toIntOrDefault(a, 2)").isEqualTo(2)
     }
 
     @Test
@@ -247,26 +248,26 @@ class UtilsTest {
 
     @Test
     fun testUptime() {
-        assertThat(uptime(547800300076L)).describedAs("full")
+        assertThat(uptime(547800300076L), "full")
             .isEqualTo("17 years 2 months 2 weeks 1 day 6 hours 45 minutes")
-        assertThat(uptime(2700000L)).describedAs("minutes").isEqualTo("45 minutes")
-        assertThat(uptime(24300000L)).describedAs("hours minutes").isEqualTo("6 hours 45 minutes")
-        assertThat(uptime(110700000L)).describedAs("days hours minutes").isEqualTo("1 day 6 hours 45 minutes")
-        assertThat(uptime(1320300000L)).describedAs("weeks days hours minutes")
+        assertThat(uptime(2700000L), "minutes").isEqualTo("45 minutes")
+        assertThat(uptime(24300000L), "hours minutes").isEqualTo("6 hours 45 minutes")
+        assertThat(uptime(110700000L), "days hours minutes").isEqualTo("1 day 6 hours 45 minutes")
+        assertThat(uptime(1320300000L), "weeks days hours minutes")
             .isEqualTo("2 weeks 1 day 6 hours 45 minutes")
-        assertThat(uptime(0L)).describedAs("0 minutes").isEqualTo("0 minute")
+        assertThat(uptime(0L), "0 minutes").isEqualTo("0 minute")
     }
 
     @Test
     @Throws(IOException::class)
     fun testUrlReader() {
-        assertThat(urlReader(URL("https://postman-echo.com/status/200"))).describedAs("urlReader()")
+        assertThat(urlReader(URL("https://postman-echo.com/status/200")), "urlReader()")
             .isEqualTo("{\"status\":200}")
     }
 
     @Test
     fun testUtcDateTime() {
-        assertThat(cal.time.toUtcDateTime()).describedAs("utcDateTime(date)").isEqualTo("1952-02-17 12:30")
-        assertThat(localDateTime.toUtcDateTime()).describedAs("utcDateTime(localDate)").isEqualTo("1952-02-17 12:30")
+        assertThat(cal.time.toUtcDateTime(), "utcDateTime(date)").isEqualTo("1952-02-17 12:30")
+        assertThat(localDateTime.toUtcDateTime(), "utcDateTime(localDate)").isEqualTo("1952-02-17 12:30")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index 86422ca..808ea97 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -31,7 +31,12 @@
  */
 package net.thauvin.erik.mobibot.commands.tell
 
-import org.assertj.core.api.Assertions.assertThat
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFalse
+import assertk.assertions.isTrue
+import assertk.assertions.prop
 import org.testng.annotations.Test
 import java.time.Duration
 import java.time.LocalDateTime
@@ -51,18 +56,21 @@ class TellMessageTest {
         val recipient = "recipient"
         val sender = "sender"
         val tellMessage = TellMessage(sender, recipient, message)
-        assertThat(tellMessage).extracting("sender", "recipient", "message")
-            .containsExactly(sender, recipient, message)
-        assertThat(isValidDate(tellMessage.queued)).describedAs("queued is valid date/time").isTrue
-        assertThat(tellMessage.isMatch(sender)).describedAs("match sender").isTrue
-        assertThat(tellMessage.isMatch(recipient)).describedAs("match recipient").isTrue
-        assertThat(tellMessage.isMatch("foo")).describedAs("foo is no match").isFalse
+        assertThat(tellMessage).all {
+            prop(TellMessage::sender).isEqualTo(sender)
+            prop(TellMessage::recipient).isEqualTo(recipient)
+            prop(TellMessage::message).isEqualTo(message)
+        }
+        assertThat(isValidDate(tellMessage.queued), "queued is valid date/time").isTrue()
+        assertThat(tellMessage.isMatch(sender), "match sender").isTrue()
+        assertThat(tellMessage.isMatch(recipient), "match recipient").isTrue()
+        assertThat(tellMessage.isMatch("foo"), "foo is no match").isFalse()
         tellMessage.isReceived = false
-        assertThat(tellMessage.receptionDate).describedAs("reception date not set").isEqualTo(LocalDateTime.MIN)
+        assertThat(tellMessage.receptionDate, "reception date not set").isEqualTo(LocalDateTime.MIN)
         tellMessage.isReceived = true
-        assertThat(tellMessage.isReceived).describedAs("is received").isTrue
-        assertThat(isValidDate(tellMessage.receptionDate)).describedAs("received is valid date/time").isTrue
+        assertThat(tellMessage.isReceived, "is received").isTrue()
+        assertThat(isValidDate(tellMessage.receptionDate), "received is valid date/time").isTrue()
         tellMessage.isNotified = true
-        assertThat(tellMessage.isNotified).describedAs("is notified").isTrue
+        assertThat(tellMessage.isNotified, "is notified").isTrue()
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
index 347b508..94a6b7e 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -31,9 +31,16 @@
  */
 package net.thauvin.erik.mobibot.entries
 
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFalse
+import assertk.assertions.isTrue
+import assertk.assertions.prop
+import assertk.assertions.size
 import com.rometools.rome.feed.synd.SyndCategory
 import com.rometools.rome.feed.synd.SyndCategoryImpl
-import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 import java.security.SecureRandom
 import java.util.Date
@@ -58,21 +65,30 @@ class EntryLinkTest {
             entryLink.addComment("c$i", "u$i")
             i++
         }
-        assertThat(entryLink.comments.size).describedAs("getComments().size() == 5").isEqualTo(i)
+        assertThat(entryLink.comments.size, "getComments().size() == 5").isEqualTo(i)
         i = 0
         for (comment in entryLink.comments) {
-            assertThat(comment).extracting("comment", "nick").containsExactly("c$i", "u$i")
+            assertThat(comment).all {
+                prop(EntryComment::comment).isEqualTo("c$i")
+                prop(EntryComment::nick).isEqualTo("u$i")
+            }
             i++
         }
+
         val r = SecureRandom()
         while (entryLink.comments.size > 0) {
             entryLink.deleteComment(r.nextInt(entryLink.comments.size))
         }
-        assertThat(entryLink.comments).describedAs("hasComments()").isEmpty()
+        assertThat(entryLink.comments, "hasComments()").isEmpty()
         entryLink.addComment("nothing", "nobody")
         entryLink.setComment(0, "something", "somebody")
-        assertThat(entryLink.getComment(0)).describedAs("get first comment").extracting("nick", "comment")
-            .containsExactly("somebody", "something")
+        val comment = entryLink.getComment(0)
+        assertThat(comment, "get first comment").all {
+            prop(EntryComment::nick).isEqualTo("somebody")
+            prop(EntryComment::comment).isEqualTo("something")
+        }
+        assertThat(entryLink.deleteComment(comment), "delete comment").isTrue()
+        assertThat(entryLink.deleteComment(comment), "comment is already deleted").isFalse()
     }
 
     @Test
@@ -80,19 +96,19 @@ class EntryLinkTest {
         val tag = "test"
         val tags = listOf(SyndCategoryImpl().apply { name = tag })
         val link = EntryLink("link", "title", "nick", "channel", Date(), tags)
-        assertThat(link.tags.size).describedAs("check tag size").isEqualTo(tags.size)
-        assertThat(link.tags[0].name).describedAs("check tag name").isEqualTo(tag)
-        assertThat(link.pinboardTags).describedAs("check pinboard tags").isEqualTo("nick,$tag")
+        assertThat(link.tags.size, "check tag size").isEqualTo(tags.size)
+        assertThat(link.tags[0].name, "check tag name").isEqualTo(tag)
+        assertThat(link.pinboardTags, "check pinboard tags").isEqualTo("nick,$tag")
     }
 
     @Test
     fun testMatches() {
-        assertThat(entryLink.matches("mobitopia")).describedAs("match mobitopia").isTrue
-        assertThat(entryLink.matches("skynx")).describedAs("match nick").isTrue
-        assertThat(entryLink.matches("www.mobitopia.org")).describedAs("match url").isTrue
-        assertThat(entryLink.matches("foo")).describedAs("match foo").isFalse
-        assertThat(entryLink.matches("")).describedAs("match empty").isFalse
-        assertThat(entryLink.matches(null)).describedAs("match null").isFalse
+        assertThat(entryLink.matches("mobitopia"), "match mobitopia").isTrue()
+        assertThat(entryLink.matches("skynx"), "match nick").isTrue()
+        assertThat(entryLink.matches("www.mobitopia.org"), "match url").isTrue()
+        assertThat(entryLink.matches("foo"), "match foo").isFalse()
+        assertThat(entryLink.matches("<empty>"), "match empty").isFalse()
+        assertThat(entryLink.matches(null), "match null").isFalse()
     }
 
 
@@ -100,20 +116,19 @@ class EntryLinkTest {
     fun testTags() {
         val tags: List<SyndCategory> = entryLink.tags
         for ((i, tag) in tags.withIndex()) {
-            assertThat(tag.name).describedAs("tag.getName($i)").isEqualTo("tag" + (i + 1))
+            assertThat(tag.name, "tag.getName($i)").isEqualTo("tag" + (i + 1))
         }
-        assertThat(entryLink.tags.size).describedAs("getTags().size() is 5").isEqualTo(5)
-        assertThat(entryLink.tags).describedAs("hasTags() is true").isNotEmpty
+        assertThat(entryLink.tags, "size is 5").size().isEqualTo(5)
         entryLink.setTags("-tag5")
         entryLink.setTags("+mobitopia")
         entryLink.setTags("tag4")
         entryLink.setTags("-mobitopia")
-        assertThat(entryLink.pinboardTags).describedAs("getPinboardTags()")
+        assertThat(entryLink.pinboardTags, "getPinboardTags()")
             .isEqualTo(entryLink.nick + ",tag1,tag2,tag3,tag4,mobitopia")
         val size = entryLink.tags.size
         entryLink.setTags("")
-        assertThat(entryLink.tags.size).describedAs("empty tag").isEqualTo(size)
+        assertThat(entryLink.tags.size, "empty tag").isEqualTo(size)
         entryLink.setTags("    ")
-        assertThat(entryLink.tags.size).describedAs("blank tag").isEqualTo(size)
+        assertThat(entryLink.tags.size, "blank tag").isEqualTo(size)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt
new file mode 100644
index 0000000..04c36a7
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt
@@ -0,0 +1,121 @@
+/*
+ * FeedMgrTest.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.entries
+
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.endsWith
+import assertk.assertions.isEqualTo
+import assertk.assertions.isTrue
+import assertk.assertions.prop
+import net.thauvin.erik.mobibot.Utils.today
+import org.testng.annotations.BeforeSuite
+import org.testng.annotations.Test
+import java.nio.file.Paths
+import java.util.Date
+import kotlin.io.path.absolutePathString
+import kotlin.io.path.deleteIfExists
+import kotlin.io.path.exists
+import kotlin.io.path.fileSize
+import kotlin.io.path.name
+
+class FeedMgrTest {
+    private val entries = Entries()
+    private val channel = "mobibot"
+
+    @BeforeSuite(alwaysRun = true)
+    fun beforeSuite() {
+        entries.logsDir = "src/test/resources/"
+        entries.ircServer = "irc.example.com"
+        entries.channel = channel
+        entries.backlogs = "https://www.mobitopia.org/mobibot/logs"
+    }
+
+    @Test
+    fun testFeedMgr() {
+        // Load the feed
+        assertThat(FeedsMgr.loadFeed(entries), "pubDate").isEqualTo("2021-10-31")
+
+        assertThat(entries.links.size, "2 links").isEqualTo(2)
+        entries.links.forEachIndexed { i, entryLink ->
+            assertThat(entryLink, "Example $(i + 1)").all {
+                prop(EntryLink::title).isEqualTo("Example ${i + 1}")
+                prop(EntryLink::link).isEqualTo("https://www.example.com/${i + 1}")
+                prop(EntryLink::channel).isEqualTo(channel)
+            }
+            entryLink.tags.forEachIndexed { y, tag ->
+                assertThat(tag.name, "tag${i + 1}-${y + 1}").isEqualTo("tag${i + 1}-${y + 1}")
+            }
+        }
+
+        with(entries.links.first()) {
+            assertThat(nick, "first nick").isEqualTo("ErikT")
+            assertThat(date, "first date").isEqualTo(Date(1635638400000L))
+            comments.forEachIndexed { i, entryComment ->
+                assertThat(entryComment.comment, "comment ${i + 1}").endsWith("comment ${i + 1}.")
+                if (i == 0) {
+                    assertThat(entryComment.nick, "comment ${i + 1} nick").isEqualTo("ErikT")
+                } else {
+                    assertThat(entryComment.nick, "comment ${i + 1} nick").isEqualTo("Skynx")
+                }
+            }
+        }
+
+        assertThat(entries.links[1], "second link").all {
+            prop(EntryLink::nick).isEqualTo("Skynx")
+            prop(EntryLink::date).isEqualTo(Date(1635638460000L))
+        }
+
+        val currentFile = Paths.get("${entries.logsDir}test.xml")
+        val backlogFile = Paths.get("${entries.logsDir}${today()}.xml")
+
+        // Save the feed
+        FeedsMgr.saveFeed(entries, currentFile.name)
+
+        assertThat(currentFile.exists(), "${currentFile.absolutePathString()} exists").isTrue()
+        assertThat(backlogFile.exists(), "${backlogFile.absolutePathString()} exits").isTrue()
+
+        assertThat(currentFile.fileSize(), "files are identical").isEqualTo(backlogFile.fileSize())
+
+        // Load the test feed
+        entries.links.clear()
+        FeedsMgr.loadFeed(entries, currentFile.name)
+
+        entries.links.forEachIndexed { i, entryLink ->
+            assertThat(entryLink.title, "${currentFile.name} title ${i + 1}").isEqualTo("Example ${i + 1}")
+        }
+
+        assertThat(currentFile.deleteIfExists(), "delete ${currentFile.absolutePathString()}").isTrue()
+        assertThat(backlogFile.deleteIfExists(), "delete ${backlogFile.absolutePathString()}").isTrue()
+    }
+}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
index ad0740e..c1b9a4d 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -31,11 +31,13 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
+import assertk.assertions.isInstanceOf
 import net.objecthunter.exp4j.tokenizer.UnknownFunctionOrVariableException
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.modules.Calc.Companion.calculate
-import org.assertj.core.api.Assertions.assertThat
-import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
 
 /**
@@ -44,11 +46,11 @@ import org.testng.annotations.Test
 class CalcTest {
     @Test
     fun testCalculate() {
-        assertThat(calculate("1 + 1")).describedAs("calculate(1+1)").isEqualTo("1+1 = %s", bold(2))
-        assertThat(calculate("1 -3")).describedAs("calculate(1 -3)").isEqualTo("1-3 = %s", bold(-2))
-        assertThat(calculate("pi+π+e+φ")).describedAs("calculate(pi+π+e+φ)")
-            .isEqualTo("pi+π+e+φ = %s", bold("10.62"))
-        assertThatThrownBy { calculate("one + one") }.describedAs("calculate(one+one)")
-            .isInstanceOf(UnknownFunctionOrVariableException::class.java)
+        assertThat(calculate("1 + 1"), "calculate(1+1)").isEqualTo("1+1 = ${bold(2)}")
+        assertThat(calculate("1 -3"), "calculate(1 -3)").isEqualTo("1-3 = ${bold(-2)}")
+        assertThat(calculate("pi+π+e+φ"), "calculate(pi+π+e+φ)")
+            .isEqualTo("pi+π+e+φ = ${bold("10.62")}")
+        assertThat { calculate("one + one") }
+            .isFailure().isInstanceOf(UnknownFunctionOrVariableException::class.java)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
index 8d0c70a..e5f5e52 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
@@ -31,8 +31,13 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isGreaterThan
+import assertk.assertions.prop
+import net.thauvin.erik.crypto.CryptoPrice
 import net.thauvin.erik.mobibot.modules.CryptoPrices.Companion.currentPrice
-import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
 /**
@@ -43,11 +48,17 @@ class CryptoPricesTest {
     @Throws(ModuleException::class)
     fun testMarketPrice() {
         var price = currentPrice(listOf("BTC"))
-        assertThat(price).extracting("base", "currency").containsExactly("BTC", "USD")
-        assertThat(price.amount.signum()).describedAs("BTC > 0").isGreaterThan(0)
+        assertThat(price, "BTC in USD").all {
+            prop(CryptoPrice::base).isEqualTo("BTC")
+            prop(CryptoPrice::currency).isEqualTo("USD")
+            prop(CryptoPrice::amount).transform { it.signum() }.isGreaterThan(0)
+        }
 
         price = currentPrice(listOf("ETH", "EUR"))
-        assertThat(price).extracting("base", "currency").containsExactly("ETH", "EUR")
-        assertThat(price.amount.signum()).describedAs("ETH > 0").isGreaterThan(0)
+        assertThat(price, "ETH in EUR").all {
+            prop(CryptoPrice::base).isEqualTo("ETH")
+            prop(CryptoPrice::currency).isEqualTo("EUR")
+            prop(CryptoPrice::amount).transform { it.signum() }.isGreaterThan(0)
+        }
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
index 84fa190..962e2c2 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
@@ -31,10 +31,21 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.any
+import assertk.assertions.contains
+import assertk.assertions.isEqualTo
+import assertk.assertions.isInstanceOf
+import assertk.assertions.matches
+import assertk.assertions.prop
+import assertk.assertions.size
 import net.thauvin.erik.mobibot.modules.CurrencyConverter.Companion.convertCurrency
 import net.thauvin.erik.mobibot.modules.CurrencyConverter.Companion.currencyRates
 import net.thauvin.erik.mobibot.modules.CurrencyConverter.Companion.loadRates
-import org.assertj.core.api.Assertions.assertThat
+import net.thauvin.erik.mobibot.msg.ErrorMessage
+import net.thauvin.erik.mobibot.msg.Message
+import net.thauvin.erik.mobibot.msg.PublicMessage
 import org.testng.annotations.BeforeClass
 import org.testng.annotations.Test
 
@@ -50,14 +61,28 @@ class CurrencyConverterTest {
 
     @Test
     fun testConvertCurrency() {
-        assertThat(convertCurrency("100 USD to EUR").msg)
-            .describedAs("100 USD to EUR").matches("\\$100\\.00 = €\\d{2,3}\\.\\d{2}")
-        assertThat(convertCurrency("100 USD to USD").msg).describedAs("100 USD to USD")
-            .contains("You're kidding, right?")
-        assertThat(convertCurrency("100 USD").msg).describedAs("100 USD").contains("Invalid query.")
+        assertThat(
+            convertCurrency("100 USD to EUR").msg,
+            "100 USD to EUR"
+        ).matches("\\$100\\.00 = €\\d{2,3}\\.\\d{2}".toRegex())
+        assertThat(convertCurrency("100 USD to USD"), "100 USD to USD").all {
+            prop(Message::msg).contains("You're kidding, right?")
+            isInstanceOf(PublicMessage::class.java)
+        }
+        assertThat(convertCurrency("100 USD"), "100 USD").all {
+            prop(Message::msg).contains("Invalid query.")
+            isInstanceOf(ErrorMessage::class.java)
+        }
+    }
+
+    @Test
+    fun testCurrencyRates() {
         val rates = currencyRates()
-        assertThat(rates.size).describedAs("currencyRates.size == 33").isEqualTo(33)
-        assertThat(rates).describedAs("currencyRates(EUR< USD)").contains("EUR:        1")
-            .anyMatch { it.matches("USD: .*".toRegex()) }
+        assertThat(rates).all {
+            size().isEqualTo(33)
+            any { it.matches("[A-Z]{3}: +[\\d.]+".toRegex()) }
+            contains("EUR:        1")
+        }
+
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
index 681dc5b..dfebd9d 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
@@ -33,14 +33,15 @@
 package net.thauvin.erik.mobibot.modules
 
 
-import org.assertj.core.api.Assertions.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import org.testng.annotations.Test
 
 class DiceTest {
     @Test
     fun testWinLoseOrTie() {
-        assertThat(Dice.winLoseOrTie(6, 6)).describedAs("6 vs. 6").isEqualTo(Dice.Result.TIE)
-        assertThat(Dice.winLoseOrTie(6, 5)).describedAs("6 vs. 5").isEqualTo(Dice.Result.WIN)
-        assertThat(Dice.winLoseOrTie(5, 6)).describedAs("5 vs. 6").isEqualTo(Dice.Result.LOSE)
+        assertThat(Dice.winLoseOrTie(6, 6), "6 vs. 6").isEqualTo(Dice.Result.TIE)
+        assertThat(Dice.winLoseOrTie(6, 5), "6 vs. 5").isEqualTo(Dice.Result.WIN)
+        assertThat(Dice.winLoseOrTie(5, 6), "5 vs. 6").isEqualTo(Dice.Result.LOSE)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index 5dfc1f2..fd7b4c7 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -31,11 +31,20 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.hasNoCause
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
+import assertk.assertions.isInstanceOf
+import assertk.assertions.isNotEmpty
+import assertk.assertions.prop
+import net.thauvin.erik.mobibot.ExceptionSanitizer.sanitize
 import net.thauvin.erik.mobibot.LocalProperties
-import net.thauvin.erik.mobibot.Sanitize.sanitizeException
 import net.thauvin.erik.mobibot.modules.GoogleSearch.Companion.searchGoogle
-import org.assertj.core.api.Assertions.assertThat
-import org.assertj.core.api.Assertions.assertThatThrownBy
+import net.thauvin.erik.mobibot.msg.ErrorMessage
+import net.thauvin.erik.mobibot.msg.Message
 import org.testng.annotations.Test
 
 /**
@@ -49,23 +58,33 @@ class GoogleSearchTest : LocalProperties() {
         val cseKey = getProperty(GoogleSearch.GOOGLE_CSE_KEY_PROP)
         try {
             var messages = searchGoogle("mobitopia", apiKey, cseKey)
-            assertThat(messages).describedAs("mobitopia results not empty").isNotEmpty
-            assertThat(messages[0].msg).describedAs("found mobibtopia").containsIgnoringCase("mobitopia")
+            assertThat(messages, "mobitopia results not empty").isNotEmpty()
+            assertThat(messages[0].msg, "found mobibtopia").contains("mobitopia", true)
+
             messages = searchGoogle("aapl", apiKey, cseKey)
-            assertThat(messages).describedAs("aapl results not empty").isNotEmpty
-            assertThat(messages[0].msg).describedAs("found apple").containsIgnoringCase("apple")
-            assertThatThrownBy { searchGoogle("test", "", "apiKey") }
-                .describedAs("no API key")
+            assertThat(messages, "aapl results not empty").isNotEmpty()
+            assertThat(messages[0].msg, "found apple").contains("apple", true)
+
+            messages = searchGoogle("adadflkjl", apiKey, cseKey)
+            assertThat(messages[0], "not found").all {
+                isInstanceOf(ErrorMessage::class.java)
+                prop(Message::msg).isEqualTo("No results found.")
+            }
+
+            assertThat(
+                searchGoogle("", "apikey", "cssKey").first(),
+                "empty query"
+            ).isInstanceOf(ErrorMessage::class.java)
+
+            assertThat { searchGoogle("test", "", "apiKey") }.isFailure()
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
-            assertThatThrownBy { searchGoogle("test", "apiKey", "") }
-                .describedAs("no CSE API key")
+
+            assertThat { searchGoogle("test", "apiKey", "") }.isFailure()
                 .isInstanceOf(ModuleException::class.java).hasNoCause()
-            assertThatThrownBy { searchGoogle("", "apikey", "apiKey") }
-                .describedAs("no query").isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
             if ("true" == System.getenv("CI")) {
-                throw sanitizeException(e, apiKey, cseKey)
+                throw e.sanitize(apiKey, cseKey)
             } else {
                 throw e
             }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
index 28fd592..865a65f 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
@@ -31,8 +31,11 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.isNotEmpty
 import net.thauvin.erik.mobibot.modules.Joke.Companion.randomJoke
-import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
 /**
@@ -42,7 +45,9 @@ class JokeTest {
     @Test
     @Throws(ModuleException::class)
     fun testRandomJoke() {
-        assertThat(randomJoke().msg).describedAs("randomJoke() > 0").isNotEmpty
-        assertThat(randomJoke().msg).describedAs("randomJoke()").containsIgnoringCase("chuck")
+        assertThat(randomJoke().msg, "randomJoke() > 0").all {
+            isNotEmpty()
+            contains("chuck", true)
+        }
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
index 211afdd..b3e3dff 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -31,9 +31,11 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.assertThat
+import assertk.assertions.any
+import assertk.assertions.contains
 import net.thauvin.erik.mobibot.modules.Lookup.Companion.nslookup
 import net.thauvin.erik.mobibot.modules.Lookup.Companion.whois
-import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
 /**
@@ -44,14 +46,13 @@ class LookupTest {
     @Throws(Exception::class)
     fun testLookup() {
         val result = nslookup("apple.com")
-        assertThat(result).describedAs("lookup(apple.com)").contains("17.253.144.10")
+        assertThat(result, "lookup(apple.com)").contains("17.253.144.10")
     }
 
     @Test
     @Throws(Exception::class)
     fun testWhois() {
         val result = whois("17.178.96.59", Lookup.WHOIS_HOST)
-        assertThat(result).describedAs("whois(17.178.96.59/Apple Inc.")
-            .anyMatch { it.contains("Apple Inc.") }
+        assertThat(result, "whois(17.178.96.59/Apple Inc.").any { it.contains("Apple Inc.") }
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
index 4ad980b..d776f2c 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
@@ -31,8 +31,16 @@
  */
 package net.thauvin.erik.mobibot.modules
 
-import net.thauvin.erik.mobibot.Sanitize.sanitizeException
-import org.assertj.core.api.Assertions.assertThat
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.doesNotContain
+import assertk.assertions.endsWith
+import assertk.assertions.hasMessage
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
+import assertk.assertions.isNull
+import net.thauvin.erik.mobibot.ExceptionSanitizer.sanitize
 import org.testng.annotations.DataProvider
 import org.testng.annotations.Test
 import java.io.IOException
@@ -58,37 +66,41 @@ class ModuleExceptionTest {
 
     @Test(dataProvider = "dp")
     fun testGetDebugMessage(e: ModuleException) {
-        assertThat(e.debugMessage).describedAs("get debug message").isEqualTo(debugMessage)
+        assertThat(e.debugMessage, "get debug message").isEqualTo(debugMessage)
     }
 
     @Test(dataProvider = "dp")
     fun testGetMessage(e: ModuleException) {
-        assertThat(e).describedAs("get message").hasMessage(message)
+        assertThat(e, "get message").hasMessage(message)
     }
 
     @Test
     fun testSanitizeMessage() {
         val apiKey = "1234567890"
         var e = ModuleException(debugMessage, message, IOException("URL http://foo.com?apiKey=$apiKey&userID=me"))
-        assertThat(sanitizeException(e, apiKey, "", "me")).describedAs("sanitized url")
-            .hasMessageContainingAll("xxxxxxxxxx", "userID=xx", "java.io.IOException")
-            .hasMessageNotContainingAny(apiKey, "me")
+        assertThat(e.sanitize(apiKey, "", "me").message, "sanitized url").isNotNull().all {
+            contains("xxxxxxxxxx", "userID=xx", "java.io.IOException")
+            doesNotContain(apiKey, "me")
+        }
 
         e = ModuleException(debugMessage, message, null)
-        assertThat(sanitizeException(e, apiKey)).describedAs("no cause").hasMessage(message)
+        assertThat(e.sanitize(apiKey), "no cause").hasMessage(message)
 
         e = ModuleException(debugMessage, message, IOException())
-        assertThat(sanitizeException(e, apiKey)).describedAs("no cause message").hasMessage(message)
+        assertThat(e.sanitize(apiKey), "no cause message").hasMessage(message)
 
         e = ModuleException(apiKey)
-        assertThat(sanitizeException(e, apiKey)).describedAs("api key in message").hasMessageNotContaining(apiKey)
+        assertThat(e.sanitize(apiKey).message, "api key in message").isNotNull().doesNotContain(apiKey)
 
         val msg: String? = null
         e = ModuleException(debugMessage, msg, IOException(msg))
-        assertThat(sanitizeException(e, apiKey).message).describedAs("null message").isNull()
+        assertThat(e.sanitize(apiKey).message, "null message").isNull()
 
         e = ModuleException(msg, msg, IOException("foo is $apiKey"))
-        assertThat(sanitizeException(e, "   ", apiKey, "foo").message).describedAs("key in cause")
-            .doesNotContain(apiKey).endsWith("xxx is xxxxxxxxxx")
+        assertThat(e.sanitize("   ", apiKey, "foo").message, "key in cause").isNotNull().all {
+            doesNotContain(apiKey)
+            endsWith("xxx is xxxxxxxxxx")
+        }
+        assertThat(e.sanitize(), "empty").isEqualTo(e)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
index e79fbcc..34cbfbb 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
@@ -31,8 +31,10 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.isNotEmpty
 import net.thauvin.erik.mobibot.modules.Ping.Companion.randomPing
-import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 
 /**
@@ -41,13 +43,13 @@ import org.testng.annotations.Test
 class PingTest {
     @Test
     fun testPingsArray() {
-        assertThat(Ping.PINGS).describedAs("Pings array is not empty.").isNotEmpty
+        assertThat(Ping.PINGS, "Pings array is not empty.").isNotEmpty()
     }
 
     @Test
     fun testRandomPing() {
         for (i in 0..9) {
-            assertThat(randomPing()).describedAs("Random ping $i").isIn(Ping.PINGS)
+            assertThat(Ping.PINGS, "Random ping $i").contains(randomPing())
         }
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
index 3f5352f..499c28c 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
@@ -32,23 +32,19 @@
 
 package net.thauvin.erik.mobibot.modules
 
-import org.assertj.core.api.Assertions.assertThat
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import org.testng.annotations.Test
 
 class RockPaperScissorsTest {
     @Test
     fun testWinLoseOrDraw() {
-        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "paper")).describedAs("scissors vs. paper")
-            .isEqualTo("win")
-        assertThat(RockPaperScissors.winLoseOrDraw("paper", "rock")).describedAs("paper vs. rock").isEqualTo("win")
-        assertThat(RockPaperScissors.winLoseOrDraw("rock", "scissors")).describedAs("rock vs. scissors")
-            .isEqualTo("win")
-        assertThat(RockPaperScissors.winLoseOrDraw("paper", "scissors")).describedAs("paper vs. scissors")
-            .isEqualTo("lose")
-        assertThat(RockPaperScissors.winLoseOrDraw("rock", "paper")).describedAs("rock vs. paper").isEqualTo("lose")
-        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "rock")).describedAs("scissors vs. rock")
-            .isEqualTo("lose")
-        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "scissors"))
-            .describedAs("scissors vs. scissors").isEqualTo("draw")
+        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "paper"), "scissors vs. paper").isEqualTo("win")
+        assertThat(RockPaperScissors.winLoseOrDraw("paper", "rock"), "paper vs. rock").isEqualTo("win")
+        assertThat(RockPaperScissors.winLoseOrDraw("rock", "scissors"), "rock vs. scissors").isEqualTo("win")
+        assertThat(RockPaperScissors.winLoseOrDraw("paper", "scissors"), "paper vs. scissors").isEqualTo("lose")
+        assertThat(RockPaperScissors.winLoseOrDraw("rock", "paper"), "rock vs. paper").isEqualTo("lose")
+        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "rock"), "scissors vs. rock").isEqualTo("lose")
+        assertThat(RockPaperScissors.winLoseOrDraw("scissors", "scissors"), "scissors vs. scissors").isEqualTo("draw")
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index 4eb4081..8812c21 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -31,11 +31,20 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.hasNoCause
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
+import assertk.assertions.isInstanceOf
+import assertk.assertions.isNotEmpty
+import assertk.assertions.matches
+import assertk.assertions.prop
+import net.thauvin.erik.mobibot.ExceptionSanitizer.sanitize
 import net.thauvin.erik.mobibot.LocalProperties
-import net.thauvin.erik.mobibot.Sanitize.sanitizeException
 import net.thauvin.erik.mobibot.modules.StockQuote.Companion.getQuote
-import org.assertj.core.api.Assertions.assertThat
-import org.assertj.core.api.Assertions.assertThatThrownBy
+import net.thauvin.erik.mobibot.msg.ErrorMessage
+import net.thauvin.erik.mobibot.msg.Message
 import org.testng.annotations.Test
 
 /**
@@ -52,24 +61,25 @@ class StockQuoteTest : LocalProperties() {
         val apiKey = getProperty(StockQuote.ALPHAVANTAGE_API_KEY_PROP)
         try {
             val messages = getQuote("apple inc", apiKey)
-            assertThat(messages).describedAs("response not empty").isNotEmpty
-            assertThat(messages[0].msg).describedAs("same stock symbol").matches("Symbol: AAPL .*")
-            assertThat(messages[1].msg).describedAs("price label").matches(buildMatch("Price"))
-            assertThat(messages[2].msg).describedAs("previous label").matches(buildMatch("Previous"))
-            assertThat(messages[3].msg).describedAs("open label").matches(buildMatch("Open"))
-            try {
-                getQuote("blahfoo", apiKey)
-            } catch (e: ModuleException) {
-                assertThat(e.message).describedAs("invalid symbol").containsIgnoringCase(StockQuote.INVALID_SYMBOL)
+            assertThat(messages, "response not empty").isNotEmpty()
+            assertThat(messages[0].msg, "same stock symbol").matches("Symbol: AAPL .*".toRegex())
+            assertThat(messages[1].msg, "price label").matches(buildMatch("Price").toRegex())
+            assertThat(messages[2].msg, "previous label").matches(buildMatch("Previous").toRegex())
+            assertThat(messages[3].msg, "open label").matches(buildMatch("Open").toRegex())
+
+            assertThat(getQuote("blahfoo", apiKey).first(), "invalid symbol").all {
+                isInstanceOf(ErrorMessage::class.java)
+                prop(Message::msg).isEqualTo(StockQuote.INVALID_SYMBOL)
             }
-            assertThatThrownBy { getQuote("test", "") }.describedAs("no API key")
-                .isInstanceOf(ModuleException::class.java).hasNoCause()
-            assertThatThrownBy { getQuote("", "apikey") }.describedAs("no symbol")
-                .isInstanceOf(ModuleException::class.java).hasNoCause()
+            assertThat(getQuote("", "apikey").first(), "empty symbol").all {
+                isInstanceOf(ErrorMessage::class.java)
+                prop(Message::msg).isEqualTo(StockQuote.INVALID_SYMBOL)
+            }
+            assertThat { getQuote("test", "") }.isFailure().isInstanceOf(ModuleException::class.java).hasNoCause()
         } catch (e: ModuleException) {
             // Avoid displaying api keys in CI logs
             if ("true" == System.getenv("CI")) {
-                throw sanitizeException(e, apiKey)
+                throw e.sanitize(apiKey)
             } else {
                 throw e
             }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
index 2257ac4..379e15a 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
@@ -31,9 +31,11 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isSuccess
 import net.thauvin.erik.mobibot.LocalProperties
 import net.thauvin.erik.mobibot.modules.Twitter.Companion.twitterPost
-import org.assertj.core.api.Assertions.assertThat
 import org.testng.annotations.Test
 import java.net.InetAddress
 import java.net.UnknownHostException
@@ -56,7 +58,7 @@ class TwitterTest : LocalProperties() {
     @Throws(ModuleException::class)
     fun testPostTwitter() {
         val msg = "Testing Twitter API from $ci"
-        assertThat(
+        assertThat {
             twitterPost(
                 getProperty(Twitter.CONSUMER_KEY_PROP),
                 getProperty(Twitter.CONSUMER_SECRET_PROP),
@@ -65,7 +67,7 @@ class TwitterTest : LocalProperties() {
                 getProperty(Twitter.HANDLE_PROP),
                 msg,
                 true
-            ).msg
-        ).describedAs("twitterPost($msg)").isEqualTo(msg)
+            )
+        }.isSuccess().isEqualTo(msg)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
index 1c503ca..a96e007 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
@@ -31,6 +31,16 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.endsWith
+import assertk.assertions.hasNoCause
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFailure
+import assertk.assertions.isInstanceOf
+import assertk.assertions.isNotNull
+import assertk.assertions.isTrue
 import net.aksingh.owmjapis.api.APIException
 import net.aksingh.owmjapis.core.OWM
 import net.thauvin.erik.mobibot.LocalProperties
@@ -39,8 +49,6 @@ import net.thauvin.erik.mobibot.modules.Weather2.Companion.ftoC
 import net.thauvin.erik.mobibot.modules.Weather2.Companion.getCountry
 import net.thauvin.erik.mobibot.modules.Weather2.Companion.getWeather
 import net.thauvin.erik.mobibot.modules.Weather2.Companion.mphToKmh
-import org.assertj.core.api.Assertions.assertThat
-import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.testng.annotations.Test
 import kotlin.random.Random
 
@@ -51,50 +59,63 @@ class Weather2Test : LocalProperties() {
     @Test
     fun testFtoC() {
         val t = ftoC(32.0)
-        assertThat(t.second).describedAs("32 °F is 0 °C").isEqualTo(0)
+        assertThat(t.second, "32 °F is 0 °C").isEqualTo(0)
     }
 
     @Test
     fun testGetCountry() {
-        assertThat(getCountry("foo")).describedAs("not a country").isEqualTo(OWM.Country.UNITED_STATES)
-        assertThat(getCountry("fr")).describedAs("fr is france").isEqualTo(OWM.Country.FRANCE)
+        assertThat(getCountry("foo"), "not a country").isEqualTo(OWM.Country.UNITED_STATES)
+        assertThat(getCountry("fr"), "fr is france").isEqualTo(OWM.Country.FRANCE)
 
         val country = OWM.Country.values()
         repeat(3) {
             val rand = country[Random.nextInt(0, country.size - 1)]
-            assertThat(getCountry(rand.value)).describedAs(rand.name).isEqualTo(rand)
+            assertThat(getCountry(rand.value), rand.name).isEqualTo(rand)
         }
     }
 
     @Test
     fun testMphToKmh() {
         val w = mphToKmh(0.62)
-        assertThat(w.second).describedAs("0.62 mph is 1 km/h").isEqualTo(1)
+        assertThat(w.second, "0.62 mph is 1 km/h").isEqualTo(1)
     }
 
     @Test
     @Throws(ModuleException::class)
     fun testWeather() {
         var messages = getWeather("98204", getProperty(OWM_API_KEY_PROP))
-        assertThat(messages[0].msg).describedAs("is Everett").contains("Everett, United States").contains("US")
-        assertThat(messages[messages.size - 1].msg).describedAs("is Everett zip code").endsWith("98204%2CUS")
+        assertThat(messages[0].msg, "is Everett").all {
+            contains("Everett, United States")
+            contains("US")
+        }
+        assertThat(messages[messages.size - 1].msg, "is Everett zip code").endsWith("98204%2CUS")
 
         messages = getWeather("San Francisco", getProperty(OWM_API_KEY_PROP))
-        assertThat(messages[0].msg).describedAs("is San Francisco").contains("San Francisco").contains("US")
-        assertThat(messages[messages.size - 1].msg).describedAs("is San Fran city code").endsWith("5391959")
+        assertThat(messages[0].msg, "is San Francisco").all {
+            contains("San Francisco")
+            contains("US")
+        }
+        assertThat(messages[messages.size - 1].msg, "is San Fran city code").endsWith("5391959")
 
         messages = getWeather("London, GB", getProperty(OWM_API_KEY_PROP))
-        assertThat(messages[0].msg).describedAs("is UK").contains("London, United Kingdom").contains("GB")
-        assertThat(messages[messages.size - 1].msg).describedAs("is London city code").endsWith("2643743")
+        assertThat(messages[0].msg, "is UK").all {
+            contains("London, United Kingdom")
+            contains("GB")
+        }
+        assertThat(messages[messages.size - 1].msg, "is London city code").endsWith("2643743")
 
-        assertThatThrownBy { getWeather("Foo, US", getProperty(OWM_API_KEY_PROP)) }
-            .describedAs("foo not found").hasCauseInstanceOf(APIException::class.java)
-        assertThatThrownBy { getWeather("test", "") }
-            .describedAs("no API key").isInstanceOf(ModuleException::class.java).hasNoCause()
-        assertThatThrownBy { getWeather("test", null) }
-            .describedAs("null API key").isInstanceOf(ModuleException::class.java).hasNoCause()
+        try {
+            getWeather("Foo, US", getProperty(OWM_API_KEY_PROP))
+        } catch (e: ModuleException) {
+            assertThat(e.cause, "cause is API exception").isNotNull().isInstanceOf(APIException::class.java)
+        }
+
+        assertThat { getWeather("test", "") }.isFailure()
+            .isInstanceOf(ModuleException::class.java).hasNoCause()
+        assertThat { getWeather("test", null) }.isFailure()
+            .isInstanceOf(ModuleException::class.java).hasNoCause()
 
         messages = getWeather("", "apikey")
-        assertThat(messages[0].isError).describedAs("no query").isTrue
+        assertThat(messages[0].isError, "no query").isTrue()
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index 49e63c1..ddc6e8f 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -31,14 +31,18 @@
  */
 package net.thauvin.erik.mobibot.modules
 
+import assertk.assertThat
+import assertk.assertions.endsWith
+import assertk.assertions.isSuccess
+import assertk.assertions.matches
+import assertk.assertions.startsWith
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.modules.WorldTime.Companion.BEATS_KEYWORD
 import net.thauvin.erik.mobibot.modules.WorldTime.Companion.COUNTRIES_MAP
 import net.thauvin.erik.mobibot.modules.WorldTime.Companion.time
-import org.assertj.core.api.Assertions.assertThat
+import org.pircbotx.Colors
 import org.testng.annotations.Test
 import java.time.ZoneId
-import java.time.zone.ZoneRulesException
 
 /**
  * The `WordTimeTest` class.
@@ -46,16 +50,23 @@ import java.time.zone.ZoneRulesException
 class WordTimeTest {
     @Test
     fun testTime() {
-        assertThat(time("PST").msg).describedAs("PST").endsWith(bold("Los Angeles"))
-        assertThat(time("BLAH").isError).describedAs("BLAH").isTrue
-        assertThat(time("BEAT").msg).describedAs(BEATS_KEYWORD).matches("[\\w ]+: .?@\\d{3}+.? .beats")
+        assertThat(time(), "no zone").matches(
+            ("The time is ${Colors.BOLD}\\d{1,2}:\\d{2}${Colors.BOLD} " +
+                    "on ${Colors.BOLD}\\w+, \\d{1,2} \\w+ \\d{4}${Colors.BOLD} " +
+                    "in ${Colors.BOLD}Los Angeles${Colors.BOLD}").toRegex()
+        )
+        assertThat(time(""), "empty zone").endsWith(bold("Los Angeles"))
+        assertThat(time("PST"), "PST").endsWith(bold("Los Angeles"))
+        assertThat(time("GB"), "GB").endsWith(bold("London"))
+        assertThat(time("FR"), "FR").endsWith(bold("Paris"))
+        assertThat(time("BLAH"), "BLAH").startsWith("Unsupported")
+        assertThat(time("BEAT"), BEATS_KEYWORD).matches("[\\w ]+ .?@\\d{3}+.? .beats".toRegex())
     }
 
     @Test
-    @Throws(ZoneRulesException::class)
-    fun testCountries() {
+    fun testZones() {
         COUNTRIES_MAP.filter { it.value != BEATS_KEYWORD }.forEach {
-            ZoneId.of(it.value)
+            assertThat { ZoneId.of(it.value) }.isSuccess()
         }
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
index 6ab62c9..94a2de0 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
@@ -32,7 +32,8 @@
 
 package net.thauvin.erik.mobibot.msg
 
-import org.assertj.core.api.Assertions.assertThat
+import assertk.assertThat
+import assertk.assertions.isTrue
 import org.testng.annotations.Test
 
 class TestMessage {
@@ -41,15 +42,15 @@ class TestMessage {
         var msg = Message()
 
         msg.isError = true
-        assertThat(msg.isNotice).describedAs("message is notice").isTrue
+        assertThat(msg.isNotice, "message is notice").isTrue()
 
         msg = Message("foo", isError = true)
-        assertThat(msg.isNotice).describedAs("message is notice too").isTrue
+        assertThat(msg.isNotice, "message is notice too").isTrue()
     }
 
     @Test
     fun testErrorMessage() {
         val msg = ErrorMessage("foo")
-        assertThat(msg.isNotice).describedAs("error message is notice").isTrue
+        assertThat(msg.isNotice, "error message is notice").isTrue()
     }
 }
diff --git a/src/test/resources/current.xml b/src/test/resources/current.xml
new file mode 100644
index 0000000..8552a9a
--- /dev/null
+++ b/src/test/resources/current.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
+    <channel>
+        <title>#mobibot IRC Links</title>
+        <link>https://www.mobitopia.org/mobibot/logs</link>
+        <description>Links from irc.example.com on #mobibot</description>
+        <language>en</language>
+        <pubDate>Sun, 31 Oct 2021 21:45:11 GMT</pubDate>
+        <dc:date>2021-10-31T21:45:11Z</dc:date>
+        <dc:language>en</dc:language>
+        <item>
+            <title>Example 2</title>
+            <link>https://www.example.com/2</link>
+            <description>Posted by &lt;b&gt;Skynx&lt;/b&gt; on &lt;a href="irc://irc.libera.chat/#mobibot"&gt;&lt;b&gt;#mobibot&lt;/b&gt;&lt;/a&gt;</description>
+            <category>tag2-1</category>
+            <category>tag2-2</category>
+            <pubDate>Sun, 31 Oct 2021 21:45:11 GMT</pubDate>
+            <guid>https://www.foo.com</guid>
+            <dc:creator>mobibot@irc.libera.chat (Skynx)</dc:creator>
+            <dc:date>2021-10-31T00:01:00Z</dc:date>
+        </item>
+        <item>
+            <title>Example 1</title>
+            <link>https://www.example.com/1</link>
+            <description>Posted by &lt;b&gt;ErikT&lt;/b&gt; on &lt;a href="irc://irc.libera.chat/#mobibot"&gt;&lt;b&gt;#mobibot&lt;/b&gt;&lt;/a&gt;
+                &lt;br/&gt;&lt;br/&gt;ErikT: This is comment 1. &lt;br/&gt;Skynx: This is comment 2.
+            </description>
+            <category>tag1-1</category>
+            <category>tag1-2</category>
+            <pubDate>Sun, 31 Oct 2021 21:43:15 GMT</pubDate>
+            <guid>https://www.example.com/</guid>
+            <dc:creator>mobibot@irc.libera.chat (ErikT)</dc:creator>
+            <dc:date>2021-10-31T00:00:00Z</dc:date>
+        </item>
+    </channel>
+</rss>
diff --git a/version.properties b/version.properties
index 772b346..f5f7c7c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Wed Sep 15 17:27:25 PDT 2021
-version.buildmeta=1400
+#Mon Nov 08 13:50:12 PST 2021
+version.buildmeta=2220
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+1400
+version.semver=0.8.0-beta+2220

From f53f43082a708deac6ec33f07b5f5f28201be445 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 9 Nov 2021 10:00:35 -0800
Subject: [PATCH 222/262] Fixed incorrect bot nickname.

---
 src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index b063549..f66ba2b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -32,6 +32,7 @@
 package net.thauvin.erik.mobibot.commands.tell
 
 import net.thauvin.erik.mobibot.Utils.bold
+import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.isChannelOp
@@ -280,7 +281,7 @@ class Tell(private val serialObject: String) : AbstractCommand() {
                 helpFormat(
                     buildCmdSyntax(
                         "%c $name $TELL_DEL_KEYWORD <id|$TELL_ALL_KEYWORD>",
-                        event.user.nick,
+                        event.bot().nick,
                         true
                     )
                 )

From 5dd8b36f92ed152c090f934e83ef82de4053c8f2 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 9 Nov 2021 10:03:15 -0800
Subject: [PATCH 223/262] Bumped CIs to Java 11 & 17.

---
 .circleci/config.yml         | 6 +++---
 .github/workflows/gradle.yml | 2 +-
 .gitlab-ci.yml               | 2 +-
 .idea/mobibot.iml            | 7 -------
 bitbucket-pipelines.yml      | 2 +-
 version.properties           | 6 +++---
 6 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 .idea/mobibot.iml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a7df501..592890a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,11 +31,11 @@ defaults_gradle: &defaults_gradle
         path: build/reports/
 
 jobs:
-  build_gradle_jdk15:
+  build_gradle_jdk17:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:15.0
+      - image: cimg/openjdk:17.0
 
     <<: *defaults_gradle
 
@@ -52,4 +52,4 @@ workflows:
   gradle:
     jobs:
       - build_gradle_jdk11
-      - build_gradle_jdk15
+      - build_gradle_jdk17
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 1bb63d7..c814746 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [ 11, 15 ]
+        java-version: [ 11, 17 ]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c415a8c..67f2bb4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: gradle:7-jdk11
+image: gradle:7-jdk17
 
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml
deleted file mode 100644
index b03a311..0000000
--- a/.idea/mobibot.iml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="SonarLintModuleSettings">
-    <option name="idePathPrefix" value="bin/main" />
-    <option name="sqPathPrefix" value="src/main/kotlin" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 219c29f..7bd4e82 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -1,4 +1,4 @@
-image: openjdk:11
+image: openjdk:17
 
 pipelines:
   default:
diff --git a/version.properties b/version.properties
index f5f7c7c..c002730 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Mon Nov 08 13:50:12 PST 2021
-version.buildmeta=2220
+#Tue Nov 09 08:47:23 PST 2021
+version.buildmeta=2227
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+2220
+version.semver=0.8.0-beta+2227

From 0a6b84fa2bdf360aad29b50c959cf75cf301fa84 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 12 Nov 2021 09:19:14 -0800
Subject: [PATCH 224/262] Switched to random extension function.

---
 src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt       | 3 +--
 src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt       | 3 +--
 .../net/thauvin/erik/mobibot/modules/RockPaperScissors.kt      | 3 +--
 .../kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt    | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 4b7257e..977a5b6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -35,7 +35,6 @@ import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import org.pircbotx.hooks.types.GenericMessageEvent
-import kotlin.random.Random
 
 /**
  * The Dice module.
@@ -67,7 +66,7 @@ class Dice : AbstractModule() {
     }
 
     private fun roll(): Pair<Int, Int> {
-        return Random.nextInt(1, DICE_FACES.size) to Random.nextInt(1, DICE_FACES.size)
+        return (1..DICE_FACES.size).random() to (1..DICE_FACES.size).random()
     }
 
     companion object {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
index 9d49118..3be959e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
@@ -34,7 +34,6 @@ package net.thauvin.erik.mobibot.modules
 import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import org.pircbotx.hooks.types.GenericMessageEvent
-import kotlin.random.Random
 
 /**
  * The Ping module.
@@ -69,7 +68,7 @@ class Ping : AbstractModule() {
 
         @JvmStatic
         fun randomPing(): String {
-            return PINGS[Random.nextInt(PINGS.size)]
+            return PINGS[PINGS.indices.random()]
         }
 
         /**
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 20c5c29..9dba554 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -36,7 +36,6 @@ import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.capitalise
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import org.pircbotx.hooks.types.GenericMessageEvent
-import kotlin.random.Random
 
 
 /**
@@ -104,7 +103,7 @@ class RockPaperScissors : AbstractModule() {
 
     override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         val hand = Hands.valueOf(cmd.uppercase())
-        val botHand = Hands.values()[Random.nextInt(0, Hands.values().size)]
+        val botHand = Hands.values()[(0..Hands.values().size).random()]
         with(event.bot()) {
             sendIRC().message(channel, "${hand.emoji}  vs. ${botHand.emoji}")
             when {
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
index a96e007..27b95c2 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
@@ -50,7 +50,6 @@ import net.thauvin.erik.mobibot.modules.Weather2.Companion.getCountry
 import net.thauvin.erik.mobibot.modules.Weather2.Companion.getWeather
 import net.thauvin.erik.mobibot.modules.Weather2.Companion.mphToKmh
 import org.testng.annotations.Test
-import kotlin.random.Random
 
 /**
  * The `Weather2Test` class.
@@ -69,7 +68,7 @@ class Weather2Test : LocalProperties() {
 
         val country = OWM.Country.values()
         repeat(3) {
-            val rand = country[Random.nextInt(0, country.size - 1)]
+            val rand = country[(country.indices).random()]
             assertThat(getCountry(rand.value), rand.name).isEqualTo(rand)
         }
     }

From 8efb09cea871c62b3b142407ccc09396370fcf64 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 12 Nov 2021 09:19:58 -0800
Subject: [PATCH 225/262] Cleaned up tests.

---
 .../kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt     | 2 +-
 src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt     | 8 ++++++--
 .../kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt   | 6 ++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
index dadf542..738a658 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
@@ -51,7 +51,7 @@ class FeedReaderTest {
     fun readFeedTest() {
         var messages = readFeed("https://feeds.thauvin.net/ethauvin")
         assertThat(messages.size, "size = 10").isEqualTo(10)
-        assertThat(messages[1].msg, "feed entry url").contains("ethauvin")
+        assertThat(messages[1].msg, "feed entry url").contains("erik.thauvin.net")
 
         messages = readFeed("https://lorem-rss.herokuapp.com/feed?length=0")
         assertThat(messages[0].msg, "nothing to view").contains("nothing")
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index fc8f117..876bea0 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -31,8 +31,10 @@
  */
 package net.thauvin.erik.mobibot
 
+import assertk.all
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import assertk.assertions.length
 import net.thauvin.erik.mobibot.Utils.appendIfMissing
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
@@ -187,8 +189,10 @@ class UtilsTest {
 
     @Test
     fun testObfuscate() {
-        assertThat(ascii.obfuscate().length, "obfuscate is right length").isEqualTo(ascii.length)
-        assertThat(ascii.obfuscate(), "obfuscate()").isEqualTo("x".repeat(ascii.length))
+        assertThat(ascii.obfuscate(), "obfuscate()").all {
+            length().isEqualTo(ascii.length)
+            isEqualTo(("x".repeat(ascii.length)))
+        }
         assertThat(" ".obfuscate(), "obfuscate(blank)").isEqualTo(" ")
     }
 
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
index c1b9a4d..80a49b5 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -48,9 +48,7 @@ class CalcTest {
     fun testCalculate() {
         assertThat(calculate("1 + 1"), "calculate(1+1)").isEqualTo("1+1 = ${bold(2)}")
         assertThat(calculate("1 -3"), "calculate(1 -3)").isEqualTo("1-3 = ${bold(-2)}")
-        assertThat(calculate("pi+π+e+φ"), "calculate(pi+π+e+φ)")
-            .isEqualTo("pi+π+e+φ = ${bold("10.62")}")
-        assertThat { calculate("one + one") }
-            .isFailure().isInstanceOf(UnknownFunctionOrVariableException::class.java)
+        assertThat(calculate("pi+π+e+φ"), "calculate(pi+π+e+φ)").isEqualTo("pi+π+e+φ = ${bold("10.62")}")
+        assertThat { calculate("one + one") }.isFailure().isInstanceOf(UnknownFunctionOrVariableException::class.java)
     }
 }

From f1b50d741c4ea4b9b40192abc5df9afa6a0ef789 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 14 Nov 2021 15:37:26 -0800
Subject: [PATCH 226/262] Cleaned up messages classes.

---
 .../thauvin/erik/mobibot/msg/ErrorMessage.kt  |  9 +---
 .../net/thauvin/erik/mobibot/msg/Message.kt   | 50 ++++++-------------
 .../thauvin/erik/mobibot/msg/NoticeMessage.kt | 10 ++--
 .../erik/mobibot/msg/PrivateMessage.kt        | 10 +---
 .../thauvin/erik/mobibot/msg/PublicMessage.kt |  7 +--
 .../thauvin/erik/mobibot/msg/TestMessage.kt   | 31 +++++++++++-
 6 files changed, 51 insertions(+), 66 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
index 35409f7..f071918 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
@@ -34,10 +34,5 @@ package net.thauvin.erik.mobibot.msg
 /**
  * The `ErrorMessage` class.
  */
-class ErrorMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
-    init {
-        this.msg = msg
-        this.color = color
-        isError = true
-    }
-}
+class ErrorMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) :
+    Message(msg, color, isError = true)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
index b410663..471c310 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
@@ -36,53 +36,31 @@ import net.thauvin.erik.semver.Constants
 /**
  * The `Message` class.
  */
-open class Message {
+open class Message @JvmOverloads constructor(
+    var msg: String,
+    var color: String = DEFAULT_COLOR,
+    var isNotice: Boolean = false,
+    isError: Boolean = false,
+    var isPrivate: Boolean = false
+) {
     companion object {
         var DEFAULT_COLOR = Constants.EMPTY
+
     }
 
-    /** Message color. */
-    var color = DEFAULT_COLOR
+    init {
+        if (isError) {
+            isNotice = true
+        }
+    }
 
     /** Error flag. */
-    var isError = false
+    var isError = isError
         set(value) {
             if (value) isNotice = value
             field = value
         }
 
-    /** Notice flag. */
-    var isNotice = false
-
-    /** Private flag. */
-    var isPrivate = false
-
-    /** Message text. */
-    var msg = ""
-
-    /** Creates a new message. */
-    constructor() {
-        // This constructor is intentionally empty
-    }
-
-    /**
-     * Creates a new message.
-     */
-    @JvmOverloads
-    constructor(
-        msg: String,
-        color: String = DEFAULT_COLOR,
-        isNotice: Boolean = false,
-        isError: Boolean = false,
-        isPrivate: Boolean = false
-    ) {
-        this.msg = msg
-        this.color = color
-        this.isNotice = isNotice
-        this.isError = isError
-        this.isPrivate = isPrivate
-    }
-
     override fun toString(): String {
         return "Message(color='$color', isError=$isError, isNotice=$isNotice, isPrivate=$isPrivate, msg='$msg')"
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
index c9fa9dc..d2353b8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
@@ -34,10 +34,6 @@ package net.thauvin.erik.mobibot.msg
 /**
  * The `NoticeMessage` class.
  */
-class NoticeMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
-    init {
-        this.msg = msg
-        this.color = color
-        isNotice = true
-    }
-}
+class NoticeMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) :
+    Message(msg, color, isNotice = true)
+
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
index 2953b7a..7515eae 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
@@ -34,11 +34,5 @@ package net.thauvin.erik.mobibot.msg
 /**
  * The `PrivateMessage` class.
  */
-@Suppress("unused")
-class PrivateMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
-    init {
-        this.msg = msg
-        this.color = color
-        isPrivate = true
-    }
-}
+class PrivateMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) :
+    Message(msg, color, isPrivate = true)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
index 397b3cf..9df2770 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
@@ -34,9 +34,4 @@ package net.thauvin.erik.mobibot.msg
 /**
  * The `PublicMessage` class.
  */
-class PublicMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
-    init {
-        this.msg = msg
-        this.color = color
-    }
-}
+class PublicMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message(msg, color)
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
index 94a2de0..3d588c5 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
@@ -32,14 +32,17 @@
 
 package net.thauvin.erik.mobibot.msg
 
+import assertk.all
 import assertk.assertThat
+import assertk.assertions.isFalse
 import assertk.assertions.isTrue
+import assertk.assertions.prop
 import org.testng.annotations.Test
 
 class TestMessage {
     @Test
     fun testConstructor() {
-        var msg = Message()
+        var msg = Message("foo")
 
         msg.isError = true
         assertThat(msg.isNotice, "message is notice").isTrue()
@@ -51,6 +54,30 @@ class TestMessage {
     @Test
     fun testErrorMessage() {
         val msg = ErrorMessage("foo")
-        assertThat(msg.isNotice, "error message is notice").isTrue()
+        assertThat(msg).all {
+            prop(Message::isError).isTrue()
+            prop(Message::isNotice).isTrue()
+            prop(Message::isPrivate).isFalse()
+        }
+    }
+
+    @Test
+    fun testNoticeMessage() {
+        val msg = NoticeMessage("food")
+        assertThat(msg).all {
+            prop(Message::isError).isFalse()
+            prop(Message::isNotice).isTrue()
+            prop(Message::isPrivate).isFalse()
+        }
+    }
+
+    @Test
+    fun testPublicMessage() {
+        val msg = PublicMessage("foo")
+        assertThat(msg).all {
+            prop(Message::isError).isFalse()
+            prop(Message::isNotice).isFalse()
+            prop(Message::isPrivate).isFalse()
+        }
     }
 }

From 29b8888eca1b4729eadcc554fdc8b2b43908926f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 14 Nov 2021 15:38:38 -0800
Subject: [PATCH 227/262] Avoid if-null Checks.

---
 .../thauvin/erik/mobibot/modules/Weather2.kt  | 53 ++++++++++---------
 .../thauvin/erik/mobibot/LocalProperties.kt   |  2 +-
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index 1b2c525..246c52a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -144,31 +144,34 @@ class Weather2 : ThreadedModule() {
                                             country.name.replace('_', ' ').capitalizeWords() + " [${country.value}]"
                                 )
                             )
-                            with(cwd.mainData) {
-                                if (this != null) {
+                            cwd.mainData?.let {
+                                with(it) {
                                     if (hasTemp()) {
                                         val t = ftoC(temp)
                                         messages.add(PublicMessage("Temperature: ${t.first}°F, ${t.second}°C"))
                                     }
-                                    if (hasHumidity() && humidity != null) {
-                                        messages.add(NoticeMessage("Humidity: ${(humidity!!).roundToInt()}%"))
+                                    if (hasHumidity()) {
+                                        humidity?.let { h ->
+                                            messages.add(NoticeMessage("Humidity: ${h.roundToInt()}%"))
+                                        }
                                     }
                                 }
                             }
                             if (cwd.hasWindData()) {
-                                with(cwd.windData) {
-                                    if (this != null && hasSpeed() && speed != null) {
-                                        val w = mphToKmh(speed!!)
-                                        messages.add(NoticeMessage("Wind: ${w.first} mph, ${w.second} km/h"))
+                                cwd.windData?.let {
+                                    if (it.hasSpeed()) {
+                                        it.speed?.let { s ->
+                                            val w = mphToKmh(s)
+                                            messages.add(NoticeMessage("Wind: ${w.first} mph, ${w.second} km/h"))
+                                        }
                                     }
                                 }
                             }
                             if (cwd.hasWeatherList()) {
                                 val condition = StringBuilder("Condition:")
-                                val list = cwd.weatherList
-                                if (list != null) {
-                                    for (w in list) {
-                                        if (w != null) {
+                                cwd.weatherList?.let {
+                                    for (w in it) {
+                                        w?.let {
                                             condition.append(' ')
                                                 .append(w.getDescription().capitalise())
                                                 .append('.')
@@ -177,19 +180,21 @@ class Weather2 : ThreadedModule() {
                                     messages.add(NoticeMessage(condition.toString()))
                                 }
                             }
-                            if (cwd.hasCityId() && cwd.cityId != null) {
-                                if (cwd.cityId!! > 0) {
-                                    messages.add(
-                                        NoticeMessage("https://openweathermap.org/city/${cwd.cityId}", Colors.GREEN)
-                                    )
-                                } else {
-                                    messages.add(
-                                        NoticeMessage(
-                                            "https://openweathermap.org/find?q="
-                                                    + encodeUrl("$city,${code.uppercase()}"),
-                                            Colors.GREEN
+                            if (cwd.hasCityId()) {
+                                cwd.cityId?.let {
+                                    if (it > 0) {
+                                        messages.add(
+                                            NoticeMessage("https://openweathermap.org/city/$it", Colors.GREEN)
                                         )
-                                    )
+                                    } else {
+                                        messages.add(
+                                            NoticeMessage(
+                                                "https://openweathermap.org/find?q="
+                                                        + encodeUrl("$city,${code.uppercase()}"),
+                                                Colors.GREEN
+                                            )
+                                        )
+                                    }
                                 }
                             }
                         }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt b/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
index 70434a4..b764ab6 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
@@ -61,7 +61,7 @@ open class LocalProperties {
                 localProps.getProperty(key)
             } else {
                 val env = System.getenv(keyToEnv(key))
-                if (env != null) {
+                env?.let {
                     localProps.setProperty(key, env)
                 }
                 env

From 9b8caaa4a8472cbb129d2d405171b16fd8388161 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 14 Nov 2021 15:40:59 -0800
Subject: [PATCH 228/262] Updated to Gradle 7.3. Bumped dependencies.

---
 build.gradle                             | 3 +++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 020006e..b6edcf7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,7 +56,10 @@ dependencies {
 
     implementation 'com.rometools:rome:1.16.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.2'
+
     implementation 'net.aksingh:owm-japis:2.5.3.0'
+    implementation 'com.google.code.gson:gson:2.8.9'
+    
     implementation 'net.objecthunter:exp4j:0.4.8'
 
     implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..e750102 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 29eae2e7ee79ecb8aa62233de1d1acf45fb5e1ac Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 14 Nov 2021 15:41:38 -0800
Subject: [PATCH 229/262] Fixed unknown host test.

---
 src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
index 738a658..b828d68 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
@@ -67,7 +67,7 @@ class FeedReaderTest {
         assertThat { readFeed("https://www.examples.com/foo") }.isFailure()
             .isInstanceOf(FileNotFoundException::class.java)
 
-        assertThat { readFeed("https://www.doesnotexists.com") }.isFailure()
+        assertThat { readFeed("https://www.examplesfoo.com/") }.isFailure()
             .isInstanceOf(UnknownHostException::class.java)
     }
 }

From 3ea0e4b3ac69e17e3c759359607e47a4bd1e56dd Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 14 Nov 2021 21:56:06 -0800
Subject: [PATCH 230/262] Reworked ModuleException.

---
 config/detekt/baseline.xml                    |  1 +
 .../erik/mobibot/modules/CurrencyConverter.kt |  4 +--
 .../erik/mobibot/modules/GoogleSearch.kt      | 17 +++++++---
 .../net/thauvin/erik/mobibot/modules/Joke.kt  |  8 +++--
 .../erik/mobibot/modules/ModuleException.kt   | 32 +++----------------
 .../erik/mobibot/modules/StockQuote.kt        |  9 ++++--
 .../thauvin/erik/mobibot/modules/Twitter.kt   |  4 ++-
 .../thauvin/erik/mobibot/modules/Weather2.kt  | 21 +++++++++---
 .../erik/mobibot/msg/PrivateMessage.kt        |  1 +
 .../mobibot/modules/ModuleExceptionTest.kt    |  4 +--
 version.properties                            |  6 ++--
 11 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 9bc0b96..3bcc3cb 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -35,6 +35,7 @@
     <ID>MagicNumber:View.kt$View$6</ID>
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$1.60934</ID>
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$32</ID>
+    <ID>MagicNumber:Weather2.kt$Weather2.Companion$404</ID>
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$5</ID>
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$9</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime$14</ID>
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index cd4bb67..ebaadb8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -210,13 +210,13 @@ class CurrencyConverter : ThreadedModule() {
                     EXCHANGE_RATES["EUR"] = "1"
                 } catch (e: JDOMException) {
                     throw ModuleException(
-                        e.message,
+                        "loadRates(): JDOM",
                         "An JDOM parsing error has occurred while parsing the exchange rates table.",
                         e
                     )
                 } catch (e: IOException) {
                     throw ModuleException(
-                        e.message,
+                        "loadRates(): IOE",
                         "An IO error has occurred while parsing the exchange rates table.",
                         e
                     )
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index 9571556..efe52ec 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -70,7 +70,9 @@ class GoogleSearch : ThreadedModule() {
                 }
             } catch (e: ModuleException) {
                 if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                event.sendMessage(e.message!!)
+                e.message?.let {
+                    event.sendMessage(it)
+                }
             }
         } else {
             helpResponse(event)
@@ -94,7 +96,10 @@ class GoogleSearch : ThreadedModule() {
         @Throws(ModuleException::class)
         fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List<Message> {
             if (apiKey.isNullOrBlank() || cseKey.isNullOrBlank()) {
-                throw ModuleException("${GOOGLE_CMD.capitalise()} is disabled. The API keys are missing.")
+                throw ModuleException(
+                    "${GoogleSearch::class.java.name} is disabled.",
+                    "${GOOGLE_CMD.capitalise()} is disabled. The API keys are missing."
+                )
             }
             val results = mutableListOf<Message>()
             if (query.isNotBlank()) {
@@ -115,9 +120,13 @@ class GoogleSearch : ThreadedModule() {
                         results.add(ErrorMessage("No results found.", Colors.RED))
                     }
                 } catch (e: IOException) {
-                    throw ModuleException("searchGoogle($query)", "An IO error has occurred searching Google.", e)
+                    throw ModuleException("searchGoogle($query): IOE", "An IO error has occurred searching Google.", e)
                 } catch (e: JSONException) {
-                    throw ModuleException("searchGoogle($query)", "A JSON error has occurred searching Google.", e)
+                    throw ModuleException(
+                        "searchGoogle($query): JSON",
+                        "A JSON error has occurred searching Google.",
+                        e
+                    )
                 }
             } else {
                 results.add(ErrorMessage("Invalid query. Please try again."))
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
index 2d5af61..3ba5f00 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -69,7 +69,9 @@ class Joke : ThreadedModule() {
                 sendIRC().notice(channel, cyan(randomJoke().msg))
             } catch (e: ModuleException) {
                 if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                event.sendMessage(e.message!!)
+                e.message?.let {
+                    event.sendMessage(it)
+                }
             }
         }
     }
@@ -96,9 +98,9 @@ class Joke : ThreadedModule() {
                         .replace("\\\"", "\"")
                 )
             } catch (e: IOException) {
-                throw ModuleException("randomJoke()", "An IO error has occurred retrieving a random joke.", e)
+                throw ModuleException("randomJoke(): IOE", "An IO error has occurred retrieving a random joke.", e)
             } catch (e: JSONException) {
-                throw ModuleException("randomJoke()", "An JSON error has occurred retrieving a random joke.", e)
+                throw ModuleException("randomJoke(): JSON", "An JSON error has occurred retrieving a random joke.", e)
             }
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
index 4c6867a..cf06b4e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -34,33 +34,11 @@ package net.thauvin.erik.mobibot.modules
 /**
  * The `ModuleException` class.
  */
-class ModuleException : Exception {
-    /**
-     * Returns the debug message.
-     */
-    val debugMessage: String?
-
-    /**
-     * Creates a new exception.
-     */
-    constructor(message: String?) : super(message) {
-        debugMessage = message
-    }
-
-    /**
-     * Creates a new exception.
-     */
-    constructor(debugMessage: String?, message: String?, cause: Throwable?) : super(message, cause) {
-        this.debugMessage = debugMessage
-    }
-
-    /**
-     * Creates a new exception.
-     */
-    constructor(debugMessage: String?, message: String?) : super(message) {
-        this.debugMessage = debugMessage
-    }
-
+class ModuleException @JvmOverloads constructor(
+    val debugMessage: String,
+    message: String? = null,
+    cause: Throwable? = null
+) : Exception(message, cause) {
     companion object {
         private const val serialVersionUID = 1L
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 230e2af..a1f17c4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -67,7 +67,9 @@ class StockQuote : ThreadedModule() {
                 }
             } catch (e: ModuleException) {
                 if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                event.sendMessage(e.message!!)
+                e.message?.let {
+                    event.sendMessage(it)
+                }
             }
         } else {
             helpResponse(event)
@@ -129,6 +131,7 @@ class StockQuote : ThreadedModule() {
         fun getQuote(symbol: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
                 throw ModuleException(
+                    "${StockQuote::class.java.name} is disabled.",
                     "${STOCK_CMD.capitalise()} is disabled. The API key is missing."
                 )
             }
@@ -216,9 +219,9 @@ class StockQuote : ThreadedModule() {
                         }
                     }
                 } catch (e: IOException) {
-                    throw ModuleException(debugMessage, "An IO error has occurred retrieving a stock quote.", e)
+                    throw ModuleException("$debugMessage: IOE", "An IO error has occurred retrieving a stock quote.", e)
                 } catch (e: NullPointerException) {
-                    throw ModuleException(debugMessage, "An error has occurred retrieving a stock quote.", e)
+                    throw ModuleException("$debugMessage: NPE", "An error has occurred retrieving a stock quote.", e)
                 }
             } else {
                 messages.add(ErrorMessage(INVALID_SYMBOL))
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
index f6020e3..c813392 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -167,7 +167,9 @@ class Twitter : ThreadedModule() {
             event.respond(post(event.user.nick, "$args (by ${event.user.nick} on $channel)", false))
         } catch (e: ModuleException) {
             if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-            event.respond(e.message)
+            e.message?.let {
+                event.respond(it)
+            }
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index 246c52a..273c374 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -73,7 +73,9 @@ class Weather2 : ThreadedModule() {
                 }
             } catch (e: ModuleException) {
                 if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
-                event.respond(e.message)
+                e.message?.let {
+                    event.respond(it)
+                }
             }
         } else {
             helpResponse(event)
@@ -116,7 +118,10 @@ class Weather2 : ThreadedModule() {
         @Throws(ModuleException::class)
         fun getWeather(query: String, apiKey: String?): List<Message> {
             if (apiKey.isNullOrBlank()) {
-                throw ModuleException("${WEATHER_CMD.capitalise()} is disabled. The API key is missing.")
+                throw ModuleException(
+                    "${Weather2::class.java.name} is disabled.",
+                    "${WEATHER_CMD.capitalise()} is disabled. The API key is missing."
+                )
             }
             val owm = OWM(apiKey)
             val messages = mutableListOf<Message>()
@@ -199,9 +204,17 @@ class Weather2 : ThreadedModule() {
                             }
                         }
                     } catch (e: APIException) {
-                        throw ModuleException("getWeather($query)", e.message, e)
+                        if (e.code == 404) {
+                            throw ModuleException(
+                                "getWeather($query): API ${e.code}",
+                                "The requested city was not found.",
+                                e
+                            )
+                        } else {
+                            throw ModuleException("getWeather($query): API ${e.code}", e.message, e)
+                        }
                     } catch (e: NullPointerException) {
-                        throw ModuleException("getWeather($query)", "Unable to perform weather lookup.", e)
+                        throw ModuleException("getWeather($query): NPE", "Unable to perform weather lookup.", e)
                     }
                 }
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
index 7515eae..6edcb96 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
@@ -34,5 +34,6 @@ package net.thauvin.erik.mobibot.msg
 /**
  * The `PrivateMessage` class.
  */
+@Suppress("unused")
 class PrivateMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) :
     Message(msg, color, isPrivate = true)
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
index d776f2c..5791867 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
@@ -89,14 +89,14 @@ class ModuleExceptionTest {
         e = ModuleException(debugMessage, message, IOException())
         assertThat(e.sanitize(apiKey), "no cause message").hasMessage(message)
 
-        e = ModuleException(apiKey)
+        e = ModuleException(debugMessage, apiKey)
         assertThat(e.sanitize(apiKey).message, "api key in message").isNotNull().doesNotContain(apiKey)
 
         val msg: String? = null
         e = ModuleException(debugMessage, msg, IOException(msg))
         assertThat(e.sanitize(apiKey).message, "null message").isNull()
 
-        e = ModuleException(msg, msg, IOException("foo is $apiKey"))
+        e = ModuleException(debugMessage, msg, IOException("foo is $apiKey"))
         assertThat(e.sanitize("   ", apiKey, "foo").message, "key in cause").isNotNull().all {
             doesNotContain(apiKey)
             endsWith("xxx is xxxxxxxxxx")
diff --git a/version.properties b/version.properties
index c002730..d3947a4 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Nov 09 08:47:23 PST 2021
-version.buildmeta=2227
+#Sun Nov 14 21:44:14 PST 2021
+version.buildmeta=2262
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+2227
+version.semver=0.8.0-beta+2262

From ba9d79ce608dbfa8a084a37acb215291bfe5cb13 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 16 Nov 2021 10:46:22 -0800
Subject: [PATCH 231/262] Converted colorize, bold, etc. to extension
 functions.

---
 .../net/thauvin/erik/mobibot/FeedReader.kt    |  3 +-
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  | 32 +++++++++----------
 .../thauvin/erik/mobibot/commands/Ignore.kt   |  2 +-
 .../net/thauvin/erik/mobibot/commands/Info.kt |  5 +--
 .../erik/mobibot/commands/links/Comment.kt    |  2 +-
 .../erik/mobibot/commands/links/LinksMgr.kt   |  2 +-
 .../erik/mobibot/commands/links/Posting.kt    |  4 +--
 .../erik/mobibot/entries/EntriesUtils.kt      |  4 +--
 .../net/thauvin/erik/mobibot/modules/Calc.kt  |  2 +-
 .../erik/mobibot/modules/CurrencyConverter.kt |  2 +-
 .../net/thauvin/erik/mobibot/modules/Dice.kt  |  4 +--
 .../net/thauvin/erik/mobibot/modules/Joke.kt  |  2 +-
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  2 +-
 .../thauvin/erik/mobibot/modules/WorldTime.kt | 15 +++------
 .../net/thauvin/erik/mobibot/UtilsTest.kt     | 32 +++++++++----------
 .../thauvin/erik/mobibot/modules/CalcTest.kt  |  6 ++--
 .../erik/mobibot/modules/WordTimeTest.kt      |  8 ++---
 17 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index 16c8e6b..739f45a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -34,6 +34,7 @@ package net.thauvin.erik.mobibot
 import com.rometools.rome.io.FeedException
 import com.rometools.rome.io.SyndFeedInput
 import com.rometools.rome.io.XmlReader
+import net.thauvin.erik.mobibot.Utils.cyan
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.sendMessage
@@ -83,7 +84,7 @@ class FeedReader(private val url: String, val event: GenericMessageEvent) : Runn
                 } else {
                     items.take(maxItems).forEach {
                         messages.add(NoticeMessage(it.title))
-                        messages.add(NoticeMessage(helpFormat(green(it.link), false)))
+                        messages.add(NoticeMessage(helpFormat(it.link.cyan(), false)))
                     }
                 }
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 6f75788..0d220c8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -75,19 +75,19 @@ object Utils {
      * Makes the given int bold.
      */
     @JvmStatic
-    fun bold(i: Int): String = bold(i.toString())
+    fun Int.bold(): String = this.toString().bold()
 
     /**
      * Makes the given long bold.
      */
     @JvmStatic
-    fun bold(i: Long): String = bold(i.toString())
+    fun Long.bold(): String = this.toString().bold()
 
     /**
      * Makes the given string bold.
      */
     @JvmStatic
-    fun bold(s: String?): String = colorize(s, Colors.BOLD)
+    fun String?.bold(): String = this.colorize(Colors.BOLD)
 
     /**
      * Returns the [PircBotX] instance.
@@ -122,15 +122,15 @@ object Utils {
      * Colorize a string.
      */
     @JvmStatic
-    fun colorize(s: String?, color: String): String {
-        return if (s.isNullOrEmpty()) {
+    fun String?.colorize(color: String): String {
+        return if (this.isNullOrEmpty()) {
             ""
         } else if (color == DEFAULT_COLOR) {
-            s
+            this
         } else if (Colors.BOLD == color || Colors.REVERSE == color) {
-            color + s + color
+            color + this + color
         } else {
-            color + s + Colors.NORMAL
+            color + this + Colors.NORMAL
         }
     }
 
@@ -138,7 +138,7 @@ object Utils {
      * Makes the given string cyan.
      */
     @JvmStatic
-    fun cyan(s: String?): String = colorize(s, Colors.CYAN)
+    fun String?.cyan(): String = this.colorize(Colors.CYAN)
 
     /**
      * URL encodes the given string.
@@ -158,7 +158,7 @@ object Utils {
      * Makes the given string green.
      */
     @JvmStatic
-    fun green(s: String?): String = colorize(s, Colors.DARK_GREEN)
+    fun String?.green(): String = this.colorize(Colors.DARK_GREEN)
 
     /**
      * Returns a formatted help string.
@@ -166,7 +166,7 @@ object Utils {
     @JvmStatic
     @JvmOverloads
     fun helpFormat(help: String, isBold: Boolean = true, isIndent: Boolean = true): String {
-        val s = if (isBold) bold(help) else help
+        val s = if (isBold) help.bold() else help
         return if (isIndent) s.prependIndent() else s
     }
 
@@ -200,7 +200,7 @@ object Utils {
      * Makes the given string red.
      */
     @JvmStatic
-    fun red(s: String?): String = colorize(s, Colors.RED)
+    fun String?.red(): String = this.colorize(Colors.RED)
 
     /**
      * Replaces all occurrences of Strings within another String.
@@ -220,7 +220,7 @@ object Utils {
      * Makes the given string reverse color.
      */
     @JvmStatic
-    fun reverseColor(s: String?): String = colorize(s, Colors.REVERSE)
+    fun String?.reverseColor(): String = this.colorize(Colors.REVERSE)
 
     /**
      * Send a formatted commands/modules, etc. list.
@@ -252,11 +252,11 @@ object Utils {
     @JvmStatic
     fun GenericMessageEvent.sendMessage(channel: String, message: Message) {
         if (message.isNotice) {
-            bot().sendIRC().notice(user.nick, colorize(message.msg, message.color))
+            bot().sendIRC().notice(user.nick, message.msg.colorize(message.color))
         } else if (message.isPrivate || this is PrivateMessageEvent || channel.isBlank()) {
-            respondPrivateMessage(colorize(message.msg, message.color))
+            respondPrivateMessage(message.msg.colorize(message.color))
         } else {
-            bot().sendIRC().message(channel, colorize(message.msg, message.color))
+            bot().sendIRC().message(channel, message.msg.colorize(message.color))
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
index d1e38ce..2dc04ca 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -134,7 +134,7 @@ class Ignore : AbstractCommand() {
             event.sendMessage("The following nicks are ignored:")
             event.sendList(ignored.sorted(), 8, isIndent = true)
         } else {
-            event.sendMessage("No one is currently ${bold("ignored")}.")
+            event.sendMessage("No one is currently ${"ignored".bold()}.")
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
index a383756..8e54bf0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
@@ -33,6 +33,7 @@ package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.ReleaseInfo
 import net.thauvin.erik.mobibot.Utils.capitalise
+import net.thauvin.erik.mobibot.Utils.cyan
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.isChannelOp
@@ -46,8 +47,8 @@ import java.lang.management.ManagementFactory
 
 class Info(private val tell: Tell) : AbstractCommand() {
     private val allVersions = listOf(
-        "${ReleaseInfo.PROJECT.capitalise()} ${ReleaseInfo.VERSION} (${green(ReleaseInfo.WEBSITE)})",
-        "Written by ${ReleaseInfo.AUTHOR} (${green(ReleaseInfo.AUTHOR_URL)})"
+        "${ReleaseInfo.PROJECT.capitalise()} ${ReleaseInfo.VERSION} (${ReleaseInfo.WEBSITE.cyan()})",
+        "Written by ${ReleaseInfo.AUTHOR} (${ReleaseInfo.AUTHOR_URL.green()})"
     )
     override val name = "info"
     override val help = listOf("To view information about the bot:", helpFormat("%c $name"))
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 61143fb..02f0a3c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -47,7 +47,7 @@ class Comment : AbstractCommand() {
     override val help = listOf(
         "To add a comment:",
         helpFormat("${Constants.LINK_CMD}1:This is a comment"),
-        "I will reply with a label, for example: ${bold(Constants.LINK_CMD)}1.1",
+        "I will reply with a label, for example: ${Constants.LINK_CMD.bold()}1.1",
         "To edit a comment, use its label: ",
         helpFormat("${Constants.LINK_CMD}1.1:This is an edited comment"),
         "To delete a comment, use its label and a minus sign: ",
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index 7bd95b8..74be69f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -167,7 +167,7 @@ class LinksMgr : AbstractCommand() {
             for (i in entries.links.indices) {
                 if (link == entries.links[i].link) {
                     val entry: EntryLink = entries.links[i]
-                    event.sendMessage(bold("Duplicate") + " >> " + EntriesUtils.buildLink(i, entry))
+                    event.sendMessage("Duplicate".bold() + " >> " + EntriesUtils.buildLink(i, entry))
                     return true
                 }
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 2e7d9ec..1a43c03 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -49,12 +49,12 @@ class Posting : AbstractCommand() {
     override val help = listOf(
         "Post a URL, by saying it on a line on its own:",
         helpFormat("<url> [<title>] ${Tags.COMMAND}: <+tag> [...]]"),
-        "I will reply with a label, for example: ${bold(Constants.LINK_CMD)}1",
+        "I will reply with a label, for example: ${Constants.LINK_CMD.bold()}1",
         "To add a title, use its label and a pipe:",
         helpFormat("${Constants.LINK_CMD}1:|This is the title"),
         "To add a comment:",
         helpFormat("${Constants.LINK_CMD}1:This is a comment"),
-        "I will reply with a label, for example: ${bold(Constants.LINK_CMD)}1.1",
+        "I will reply with a label, for example: ${Constants.LINK_CMD.bold()}1.1",
         "To edit a comment, see: ",
         helpFormat("%c ${Constants.HELP_CMD} ${Comment.COMMAND}")
     )
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index b577895..4c4c29c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -65,9 +65,9 @@ object EntriesUtils {
             if (Constants.NO_TITLE == title) {
                 buff.append(title)
             } else {
-                buff.append(bold(title))
+                buff.append(title.bold())
             }
-            buff.append(" ( ").append(green(link)).append(" )")
+            buff.append(" ( ").append(link.green()).append(" )")
         }
         return buff.toString()
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
index efe87e5..25ae072 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -74,7 +74,7 @@ class Calc : AbstractModule() {
         fun calculate(query: String): String {
             val decimalFormat = DecimalFormat("#.##")
             val calc = ExpressionBuilder(query).build()
-            return query.replace(" ", "") + " = " + bold(decimalFormat.format(calc.evaluate()))
+            return query.replace(" ", "") + " = " + decimalFormat.format(calc.evaluate()).bold()
         }
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index ebaadb8..915aa49 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -89,7 +89,7 @@ class CurrencyConverter : ThreadedModule() {
                 helpResponse(event)
             }
         } else if (args.contains(CURRENCY_RATES_KEYWORD)) {
-            event.sendMessage("The reference rates for ${bold(pubDate)} are:")
+            event.sendMessage("The reference rates for ${pubDate.bold()} are:")
             event.sendList(currencyRates(), 3, "   ", isIndent = true)
         } else {
             helpResponse(event)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 977a5b6..4dced28 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -47,11 +47,11 @@ class Dice : AbstractModule() {
         val total = roll.first + roll.second
         with(event.bot()) {
             event.respond(
-                "you rolled ${DICE_FACES[roll.first]}  ${DICE_FACES[roll.second]}  for a total of ${bold(total)}"
+                "you rolled ${DICE_FACES[roll.first]}  ${DICE_FACES[roll.second]}  for a total of ${total.bold()}"
             )
             sendIRC().action(
                 channel,
-                "rolled ${DICE_FACES[botRoll.first]}  ${DICE_FACES[botRoll.second]}  for a total of ${bold(botTotal)}"
+                "rolled ${DICE_FACES[botRoll.first]}  ${DICE_FACES[botRoll.second]}  for a total of ${botTotal.bold()}"
             )
             when (winLoseOrTie(botTotal, total)) {
                 Result.WIN -> sendIRC().action(channel, "wins.")
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
index 3ba5f00..26d7af3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -66,7 +66,7 @@ class Joke : ThreadedModule() {
     override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         with(event.bot()) {
             try {
-                sendIRC().notice(channel, cyan(randomJoke().msg))
+                sendIRC().notice(channel, randomJoke().msg.cyan())
             } catch (e: ModuleException) {
                 if (logger.isWarnEnabled) logger.warn(e.debugMessage, e)
                 e.message?.let {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index 273c374..f5f1e16 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -240,7 +240,7 @@ class Weather2 : ThreadedModule() {
             add(helpFormat("%c $WEATHER_CMD <city> [, <country code>]"))
             add("For example:")
             add(helpFormat("%c $WEATHER_CMD paris, fr"))
-            add("The default ISO 3166 country code is ${bold("US")}. Zip codes supported in most countries.")
+            add("The default ISO 3166 country code is ${"US".bold()}. Zip codes supported in most countries.")
         }
         initProperties(OWM_API_KEY_PROP)
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 3105d97..5d9fcde 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -64,7 +64,7 @@ class WorldTime : AbstractModule() {
 
         // Date/Time Format
         private var dtf =
-            DateTimeFormatter.ofPattern("'The time is ${bold("'HH:mm'")} on ${bold("'EEEE, d MMMM yyyy'")} in '")
+            DateTimeFormatter.ofPattern("'The time is ${"'HH:mm'".bold()} on ${"'EEEE, d MMMM yyyy'".bold()} in '")
 
         /**
          * Returns the current Internet (beat) Time.
@@ -84,10 +84,10 @@ class WorldTime : AbstractModule() {
             val tz = COUNTRIES_MAP[(if (query.isNotBlank()) query.trim().uppercase() else DEFAULT_ZONE)]
             return if (tz != null) {
                 if (BEATS_KEYWORD == tz) {
-                    "The current Internet Time is ${bold(internetTime())} $BEATS_KEYWORD"
+                    "The current Internet Time is ${internetTime().bold()} $BEATS_KEYWORD"
                 } else {
                     (ZonedDateTime.now().withZoneSameInstant(ZoneId.of(tz)).format(dtf)
-                            + bold(tz.substring(tz.lastIndexOf('/') + 1).replace('_', ' ')))
+                            + tz.substring(tz.lastIndexOf('/') + 1).replace('_', ' ').bold())
                 }
             } else {
                 "Unsupported country/zone. Please try again."
@@ -362,13 +362,8 @@ class WorldTime : AbstractModule() {
             zones["ZM"] = "Africa/Lusaka"
             zones["ZULU"] = "Zulu"
             zones["ZW"] = "Africa/Harare"
-            ZoneId.getAvailableZoneIds().stream()
-                .filter { tz: String ->
-                    tz.length <= 3 && !zones.containsKey(tz)
-                }
-                .forEach { tz: String ->
-                    zones[tz] = tz
-                }
+            ZoneId.getAvailableZoneIds().filter { it.length <= 3 && !zones.containsKey(it) }
+                .forEach { tz -> zones[tz] = tz }
             COUNTRIES_MAP = Collections.unmodifiableMap(zones)
         }
     }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 876bea0..92ac36f 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -97,10 +97,10 @@ class UtilsTest {
 
     @Test
     fun testBold() {
-        assertThat(bold(1), "bold(1)").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
-        assertThat(bold(2L), "bold(1)").isEqualTo(Colors.BOLD + "2" + Colors.BOLD)
-        assertThat(bold(ascii), "bold(ascii)").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
-        assertThat(bold("test"), "bold(test)").isEqualTo(Colors.BOLD + "test" + Colors.BOLD)
+        assertThat(1.bold(), "1.bold()").isEqualTo(Colors.BOLD + "1" + Colors.BOLD)
+        assertThat(2L.bold(), "1.bold()").isEqualTo(Colors.BOLD + "2" + Colors.BOLD)
+        assertThat(ascii.bold(), "ascii.bold()").isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
+        assertThat("test".bold(), "test.bold()").isEqualTo(Colors.BOLD + "test" + Colors.BOLD)
     }
 
     @Test
@@ -131,23 +131,23 @@ class UtilsTest {
 
     @Test
     fun testColorize() {
-        assertThat(colorize(ascii, Colors.REVERSE), "colorize(reverse)").isEqualTo(
+        assertThat(ascii.colorize(Colors.REVERSE), "reverse.colorize()").isEqualTo(
             Colors.REVERSE + ascii + Colors.REVERSE
         )
-        assertThat(colorize(ascii, Colors.RED), "colorize(red)")
+        assertThat(ascii.colorize(Colors.RED), "red.colorize()")
             .isEqualTo(Colors.RED + ascii + Colors.NORMAL)
-        assertThat(colorize(ascii, Colors.BOLD), "colorized(bold)")
+        assertThat(ascii.colorize(Colors.BOLD), "colorized(bold)")
             .isEqualTo(Colors.BOLD + ascii + Colors.BOLD)
-        assertThat(colorize(null, Colors.RED), "colorize(null)").isEqualTo("")
-        assertThat(colorize("", Colors.RED), "colorize()").isEqualTo("")
-        assertThat(colorize(ascii, DEFAULT_COLOR), "colorize(none)").isEqualTo(ascii)
-        assertThat(colorize("   ", Colors.NORMAL), "colorize(blank)")
+        assertThat(null.colorize(Colors.RED), "null.colorize()").isEqualTo("")
+        assertThat("".colorize(Colors.RED), "colorize()").isEqualTo("")
+        assertThat(ascii.colorize(DEFAULT_COLOR), "none.colorize()").isEqualTo(ascii)
+        assertThat("   ".colorize(Colors.NORMAL), "blank.colorize()")
             .isEqualTo(Colors.NORMAL + "   " + Colors.NORMAL)
     }
 
     @Test
     fun testCyan() {
-        assertThat(cyan(ascii)).isEqualTo(Colors.CYAN + ascii + Colors.NORMAL)
+        assertThat(ascii.cyan()).isEqualTo(Colors.CYAN + ascii + Colors.NORMAL)
     }
 
     @Test
@@ -167,7 +167,7 @@ class UtilsTest {
 
     @Test
     fun testGreen() {
-        assertThat(green(ascii)).isEqualTo(Colors.DARK_GREEN + ascii + Colors.NORMAL)
+        assertThat(ascii.green()).isEqualTo(Colors.DARK_GREEN + ascii + Colors.NORMAL)
     }
 
     @Test
@@ -177,7 +177,7 @@ class UtilsTest {
         assertThat(helpFormat(test, isBold = false, isIndent = true), "indent")
             .isEqualTo(test.prependIndent())
         assertThat(helpFormat(test, isBold = true, isIndent = true), "bold-indent")
-            .isEqualTo(colorize(test, Colors.BOLD).prependIndent())
+            .isEqualTo(test.colorize(Colors.BOLD).prependIndent())
 
     }
 
@@ -224,12 +224,12 @@ class UtilsTest {
 
     @Test
     fun testRed() {
-        assertThat(red(ascii)).isEqualTo(colorize(ascii, Colors.RED))
+        assertThat(ascii.red()).isEqualTo(ascii.colorize(Colors.RED))
     }
 
     @Test
     fun testReverseColor() {
-        assertThat(reverseColor(ascii)).isEqualTo(Colors.REVERSE + ascii + Colors.REVERSE)
+        assertThat(ascii.reverseColor()).isEqualTo(Colors.REVERSE + ascii + Colors.REVERSE)
     }
 
     @Test
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
index 80a49b5..b37a09c 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -46,9 +46,9 @@ import org.testng.annotations.Test
 class CalcTest {
     @Test
     fun testCalculate() {
-        assertThat(calculate("1 + 1"), "calculate(1+1)").isEqualTo("1+1 = ${bold(2)}")
-        assertThat(calculate("1 -3"), "calculate(1 -3)").isEqualTo("1-3 = ${bold(-2)}")
-        assertThat(calculate("pi+π+e+φ"), "calculate(pi+π+e+φ)").isEqualTo("pi+π+e+φ = ${bold("10.62")}")
+        assertThat(calculate("1 + 1"), "calculate(1+1)").isEqualTo("1+1 = ${2.bold()}")
+        assertThat(calculate("1 -3"), "calculate(1 -3)").isEqualTo("1-3 = ${(-2).bold()}")
+        assertThat(calculate("pi+π+e+φ"), "calculate(pi+π+e+φ)").isEqualTo("pi+π+e+φ = ${"10.62".bold()}")
         assertThat { calculate("one + one") }.isFailure().isInstanceOf(UnknownFunctionOrVariableException::class.java)
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index ddc6e8f..abe9416 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -55,10 +55,10 @@ class WordTimeTest {
                     "on ${Colors.BOLD}\\w+, \\d{1,2} \\w+ \\d{4}${Colors.BOLD} " +
                     "in ${Colors.BOLD}Los Angeles${Colors.BOLD}").toRegex()
         )
-        assertThat(time(""), "empty zone").endsWith(bold("Los Angeles"))
-        assertThat(time("PST"), "PST").endsWith(bold("Los Angeles"))
-        assertThat(time("GB"), "GB").endsWith(bold("London"))
-        assertThat(time("FR"), "FR").endsWith(bold("Paris"))
+        assertThat(time(""), "empty zone").endsWith("Los Angeles".bold())
+        assertThat(time("PST"), "PST").endsWith("Los Angeles".bold())
+        assertThat(time("GB"), "GB").endsWith("London".bold())
+        assertThat(time("FR"), "FR").endsWith("Paris".bold())
         assertThat(time("BLAH"), "BLAH").startsWith("Unsupported")
         assertThat(time("BEAT"), BEATS_KEYWORD).matches("[\\w ]+ .?@\\d{3}+.? .beats".toRegex())
     }

From bc75d1eb7376150db6879a7028775bcf7443a0c9 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 16 Nov 2021 19:38:14 -0800
Subject: [PATCH 232/262] Improved event null-checks.

---
 .../net/thauvin/erik/mobibot/Mobibot.kt       | 96 +++++++++++--------
 .../erik/mobibot/modules/CryptoPrices.kt      |  4 +-
 2 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 574366a..ec571f7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -162,73 +162,87 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     }
 
     override fun onAction(event: ActionEvent?) {
-        if (channel == event?.channel?.name) {
-            storeRecap(event.user!!.nick, event.action, true)
+        event?.channel?.let {
+            if (channel == it.name) {
+                event.user?.let { user ->
+                    storeRecap(user.nick, event.action, true)
+                }
+            }
         }
     }
 
     override fun onDisconnect(event: DisconnectEvent?) {
-        with(event!!.getBot<PircBotX>()) {
-            LinksMgr.twitter.notification("$nick disconnected from irc://$serverHostname")
+        event?.let {
+            with(event.getBot<PircBotX>()) {
+                LinksMgr.twitter.notification("$nick disconnected from irc://$serverHostname")
+            }
         }
         LinksMgr.twitter.shutdown()
     }
 
     override fun onPrivateMessage(event: PrivateMessageEvent?) {
-        if (logger.isTraceEnabled) logger.trace("<<< ${event!!.user!!.nick}: ${event.message}")
-        val cmds = event!!.message.trim().split(" ".toRegex(), 2)
-        val cmd = cmds[0].lowercase()
-        val args = if (cmds.size > 1) {
-            cmds[1].trim()
-        } else ""
-        if (cmd.startsWith(Constants.HELP_CMD)) { // help
-            helpResponse(event, args)
-        } else if (!addons.exec(channel, cmd, args, event)) { // Execute command or module
-            helpDefault(event)
+        event?.user?.let { user ->
+            if (logger.isTraceEnabled) logger.trace("<<< ${user.nick}: ${event.message}")
+            val cmds = event.message.trim().split(" ".toRegex(), 2)
+            val cmd = cmds[0].lowercase()
+            val args = if (cmds.size > 1) {
+                cmds[1].trim()
+            } else ""
+            if (cmd.startsWith(Constants.HELP_CMD)) { // help
+                helpResponse(event, args)
+            } else if (!addons.exec(channel, cmd, args, event)) { // Execute command or module
+                helpDefault(event)
+            }
         }
     }
 
     override fun onJoin(event: JoinEvent?) {
-        with(event!!.getBot<PircBotX>()) {
-            if (event.user!!.nick == nick) {
-                LinksMgr.twitter.notification("$nick has joined ${event.channel.name} on irc://$serverHostname")
-            } else {
-                tell.send(event)
+        event?.user?.let { user ->
+            with(event.getBot<PircBotX>()) {
+                if (user.nick == nick) {
+                    LinksMgr.twitter.notification("$nick has joined ${event.channel.name} on irc://$serverHostname")
+                } else {
+                    tell.send(event)
+                }
             }
         }
     }
 
     override fun onMessage(event: MessageEvent?) {
-        val sender = event!!.user!!.nick
-        val message = event.message
-        tell.send(event)
-        if (message.matches("(?i)${Pattern.quote(event.bot().nick)}:.*".toRegex())) { // mobibot: <command>
-            if (logger.isTraceEnabled) logger.trace(">>> $sender: $message")
-            val cmds = message.substring(message.indexOf(':') + 1).trim().split(" ".toRegex(), 2)
-            val cmd = cmds[0].lowercase()
-            val args = if (cmds.size > 1) {
-                cmds[1].trim()
-            } else ""
-            if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
-                helpResponse(event, args)
-            } else {
-                // Execute module or command
-                addons.exec(channel, cmd, args, event)
+        event?.user?.let { user ->
+            val sender = user.nick
+            val message = event.message
+            tell.send(event)
+            if (message.matches("(?i)${Pattern.quote(event.bot().nick)}:.*".toRegex())) { // mobibot: <command>
+                if (logger.isTraceEnabled) logger.trace(">>> $sender: $message")
+                val cmds = message.substring(message.indexOf(':') + 1).trim().split(" ".toRegex(), 2)
+                val cmd = cmds[0].lowercase()
+                val args = if (cmds.size > 1) {
+                    cmds[1].trim()
+                } else ""
+                if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
+                    helpResponse(event, args)
+                } else {
+                    // Execute module or command
+                    addons.exec(channel, cmd, args, event)
+                }
+            } else if (addons.match(channel, event)) { // Links, e.g.: https://www.example.com/ or L1: , etc.
+                if (logger.isTraceEnabled) logger.trace(">>> $sender: $message")
             }
-        } else if (addons.match(channel, event)) { // Links, e.g.: https://www.example.com/ or L1: , etc.
-            if (logger.isTraceEnabled) logger.trace(">>> $sender: $message")
+            storeRecap(sender, message, false)
         }
-        storeRecap(sender, message, false)
     }
 
     override fun onNickChange(event: NickChangeEvent?) {
-        tell.send(event!!)
+        event?.let { tell.send(event) }
     }
 
     override fun onPart(event: PartEvent?) {
-        with(event!!.getBot<PircBotX>()) {
-            if (event.user!!.nick == nick) {
-                LinksMgr.twitter.notification("$nick has left ${event.channel.name} on irc://$serverHostname")
+        event?.user?.let { user ->
+            with(event.getBot<PircBotX>()) {
+                if (user.nick == nick) {
+                    LinksMgr.twitter.notification("$nick has left ${event.channel.name} on irc://$serverHostname")
+                }
             }
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index 6cd8906..9721055 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -63,7 +63,9 @@ class CryptoPrices : ThreadedModule() {
                 event.respond("${price.base} current price is $amount [${price.currency}]")
             } catch (e: CryptoException) {
                 if (logger.isWarnEnabled) logger.warn("$debugMessage => ${e.statusCode}", e)
-                event.sendMessage(e.message!!)
+                e.message?.let {
+                    event.sendMessage(it)
+                }
             } catch (e: IOException) {
                 if (logger.isErrorEnabled) logger.error(debugMessage, e)
                 event.sendMessage("An IO error has occurred while retrieving the cryptocurrency market price.")

From 2963e747be50d767f671c322007db495845d540c Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 16 Nov 2021 22:02:45 -0800
Subject: [PATCH 233/262] Added more tests.

---
 .../thauvin/erik/mobibot/commands/Recap.kt    |  4 +-
 .../erik/mobibot/commands/links/LinksMgr.kt   | 26 +++---
 .../erik/mobibot/commands/links/View.kt       | 48 +++++-----
 .../erik/mobibot/commands/RecapTest.kt        | 54 +++++++++++
 .../mobibot/commands/links/LinksMgrTest.kt    | 75 +++++++++++++++
 .../erik/mobibot/commands/links/ViewTest.kt   | 92 +++++++++++++++++++
 6 files changed, 264 insertions(+), 35 deletions(-)
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgrTest.kt
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
index 03b349c..6fe1e36 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -50,6 +50,8 @@ class Recap : AbstractCommand() {
     override val isVisible = true
 
     companion object {
+        const val MAX_RECAPS = 10
+
         @JvmField
         val recaps = mutableListOf<String>()
 
@@ -62,7 +64,7 @@ class Recap : AbstractCommand() {
                 LocalDateTime.now(Clock.systemUTC()).toUtcDateTime()
                         + " - $sender" + (if (isAction) " " else ": ") + message
             )
-            if (recaps.size > 10) {
+            if (recaps.size > MAX_RECAPS) {
                 recaps.removeFirst()
             }
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index 74be69f..17b06e1 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -42,7 +42,8 @@ import net.thauvin.erik.mobibot.Utils.today
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.Ignore.Companion.isNotIgnored
 import net.thauvin.erik.mobibot.entries.Entries
-import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntriesUtils.buildLink
+import net.thauvin.erik.mobibot.entries.EntriesUtils.buildLinkLabel
 import net.thauvin.erik.mobibot.entries.EntryLink
 import net.thauvin.erik.mobibot.modules.Twitter
 import org.jsoup.Jsoup
@@ -124,7 +125,7 @@ class LinksMgr : AbstractCommand() {
                 val entry = EntryLink(link, title, sender, login, channel, tags)
                 entries.links.add(entry)
                 val index = entries.links.lastIndexOf(entry)
-                event.sendMessage(EntriesUtils.buildLink(index, entry))
+                event.sendMessage(buildLink(index, entry))
 
                 pinboard.addPin(event.bot().serverHostname, entry)
 
@@ -135,7 +136,7 @@ class LinksMgr : AbstractCommand() {
 
                 if (Constants.NO_TITLE == entry.title) {
                     event.sendMessage("Please specify a title, by typing:")
-                    event.sendMessage(helpFormat("${EntriesUtils.buildLinkLabel(index)}:|This is the title"))
+                    event.sendMessage(helpFormat("${buildLinkLabel(index)}:|This is the title"))
                 }
             }
         }
@@ -147,7 +148,7 @@ class LinksMgr : AbstractCommand() {
         return message.matches(LINK_MATCH.toRegex())
     }
 
-    private fun fetchTitle(link: String): String {
+    internal fun fetchTitle(link: String): String {
         try {
             val html = Jsoup.connect(link)
                 .userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/74.0")
@@ -164,18 +165,19 @@ class LinksMgr : AbstractCommand() {
 
     private fun isDupEntry(link: String, event: GenericMessageEvent): Boolean {
         synchronized(entries) {
-            for (i in entries.links.indices) {
-                if (link == entries.links[i].link) {
-                    val entry: EntryLink = entries.links[i]
-                    event.sendMessage("Duplicate".bold() + " >> " + EntriesUtils.buildLink(i, entry))
-                    return true
-                }
+            return try {
+                val match = entries.links.single { it.link == link }
+                event.sendMessage(
+                    "Duplicate".bold() + " >> " + buildLink(entries.links.indexOf(match), match)
+                )
+                true
+            } catch (ignore: NoSuchElementException) {
+                false
             }
         }
-        return false
     }
 
-    private fun matchTagKeywords(title: String, tags: MutableList<String>) {
+    internal fun matchTagKeywords(title: String, tags: MutableList<String>) {
         for (match in keywords) {
             val m = Regex.escape(match)
             if (title.matches("(?i).*\\b$m\\b.*".toRegex())) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
index 5d446d2..c9021fb 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -60,56 +60,60 @@ class View : AbstractCommand() {
 
     override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         if (entries.links.isNotEmpty()) {
-            showPosts(args, event)
+            val p = parseArgs(args)
+            showPosts(p.first, p.second, event)
         } else {
             event.sendMessage("There is currently nothing to view. Why don't you post something?")
         }
     }
 
-    private fun showPosts(args: String, event: GenericMessageEvent) {
-        val max = entries.links.size
-        var lcArgs = args.lowercase()
-        var i = 0
-        if (lcArgs.isEmpty() && max > maxEntries) {
-            i = max - maxEntries
+    internal fun parseArgs(args: String): Pair<Int, String> {
+        var query = args.lowercase().trim()
+        var start = 0
+        if (query.isEmpty() && entries.links.size > maxEntries) {
+            start = entries.links.size - maxEntries
         }
-        if (lcArgs.matches("^\\d+(| .*)".toRegex())) {
-            val split = lcArgs.split(" ", limit = 2)
+        if (query.matches("^\\d+(| .*)".toRegex())) { // view [<start>] [<query>]
+            val split = query.split(" ", limit = 2)
             try {
-                i = split[0].toInt() - 1
-                lcArgs = if (split.size == 2) {
+                start = split[0].toInt() - 1
+                query = if (split.size == 2) {
                     split[1].trim()
                 } else {
                     ""
                 }
-                if (i > max) {
-                    i = 0
+                if (start > entries.links.size) {
+                    start = 0
                 }
             } catch (ignore: NumberFormatException) {
                 // Do nothing
             }
         }
+        return Pair(start, query)
+    }
 
+    private fun showPosts(start: Int, query: String, event: GenericMessageEvent) {
+        var index = start
         var entry: EntryLink
         var sent = 0
-        while (i < max && sent < maxEntries) {
-            entry = entries.links[i]
-            if (lcArgs.isNotBlank()) {
-                if (entry.matches(lcArgs)) {
-                    event.sendMessage(EntriesUtils.buildLink(i, entry, true))
+        while (index < entries.links.size && sent < maxEntries) {
+            entry = entries.links[index]
+            if (query.isNotBlank()) {
+                if (entry.matches(query)) {
+                    event.sendMessage(EntriesUtils.buildLink(index, entry, true))
                     sent++
                 }
             } else {
-                event.sendMessage(EntriesUtils.buildLink(i, entry, true))
+                event.sendMessage(EntriesUtils.buildLink(index, entry, true))
                 sent++
             }
-            i++
-            if (sent == maxEntries && i < max) {
+            index++
+            if (sent == maxEntries && index < entries.links.size) {
                 event.sendMessage("To view more, try: ")
                 event.sendMessage(
                     helpFormat(
                         buildCmdSyntax(
-                            "%c $name ${i + 1} $lcArgs",
+                            "%c $name ${index + 1} $query",
                             event.bot().nick,
                             event is PrivateMessageEvent
                         )
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
new file mode 100644
index 0000000..d347f1a
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
@@ -0,0 +1,54 @@
+/*
+ * RecapTest.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands
+
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.isEqualTo
+import assertk.assertions.prop
+import assertk.assertions.size
+import org.testng.annotations.Test
+
+class RecapTest {
+    @Test
+    fun storeRecapTest() {
+        for (i in 1..20) {
+            Recap.storeRecap("sender$i", "test $1", false)
+        }
+        assertThat(Recap.recaps).all {
+            size().isEqualTo(Recap.MAX_RECAPS)
+            prop(MutableList<String>::last).contains("sender20")
+        }
+    }
+}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgrTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgrTest.kt
new file mode 100644
index 0000000..12fccbd
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgrTest.kt
@@ -0,0 +1,75 @@
+/*
+ * LinksMgrTest.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.isEqualTo
+import assertk.assertions.isTrue
+import assertk.assertions.size
+import net.thauvin.erik.mobibot.Constants
+import org.testng.annotations.Test
+
+class LinksMgrTest {
+    private val linksMgr = LinksMgr()
+
+    @Test
+    fun fetchTitle() {
+        assertThat(linksMgr.fetchTitle("https://erik.thauvin.net/"), "Erik").contains("Erik's Weblog")
+        assertThat(linksMgr.fetchTitle("https://www.google.com/foo"), "Foo").isEqualTo(Constants.NO_TITLE)
+    }
+
+    @Test
+    fun testMatches() {
+        assertThat(linksMgr.matches("https://www.example.com/"), "https").isTrue()
+        assertThat(linksMgr.matches("HTTP://erik.thauvin.net/blog/ Erik's Weblog"), "HTTP").isTrue()
+    }
+
+    @Test
+    fun matchTagKeywordsTest() {
+        linksMgr.setProperty(LinksMgr.KEYWORDS_PROP, "key1 key2,key3")
+        val tags = mutableListOf<String>()
+
+        linksMgr.matchTagKeywords("Test title with key2", tags)
+        assertThat(tags, "key2").contains("key2")
+        tags.clear()
+
+        linksMgr.matchTagKeywords("Test key3 title with key1", tags)
+        assertThat(tags, "key1 & key 3").all {
+            contains("key1")
+            contains("key3")
+            size().isEqualTo(2)
+        }
+    }
+}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt
new file mode 100644
index 0000000..a239dfd
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt
@@ -0,0 +1,92 @@
+/*
+ * ViewTest.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.links
+
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.prop
+import net.thauvin.erik.mobibot.entries.EntryLink
+import org.testng.annotations.Test
+
+class ViewTest {
+    @Test
+    fun testParseArgs() {
+        val view = View()
+
+        for (i in 1..3) {
+            LinksMgr.entries.links.add(
+                EntryLink(
+                    "https://www.example.com/$i",
+                    "Example $i",
+                    "nick$i",
+                    "login$i",
+                    "#channel",
+                    emptyList()
+                )
+            )
+        }
+
+        assertThat(view.parseArgs("1"), "parseArgs(1)").all {
+            prop(Pair<Int, String>::first).isEqualTo(0)
+            prop(Pair<Int, String>::second).isEqualTo("")
+        }
+
+        assertThat(view.parseArgs("2 foo"), "parseArgs(2, foo)").all {
+            prop(Pair<Int, String>::first).isEqualTo(1)
+            prop(Pair<Int, String>::second).isEqualTo("foo")
+        }
+
+        assertThat(view.parseArgs("3 FOO"), "parseArgs(3, FOO)").all {
+            prop(Pair<Int, String>::first).isEqualTo(2)
+            prop(Pair<Int, String>::second).isEqualTo("foo")
+        }
+
+        assertThat(view.parseArgs(" 4 foo bar "), "parseArgs( 4 foo bar )").all {
+            prop(Pair<Int, String>::first).isEqualTo(3)
+            prop(Pair<Int, String>::second).isEqualTo("foo bar")
+        }
+
+        assertThat(view.parseArgs("5"), "parseArgs(5)").all {
+            prop(Pair<Int, String>::first).isEqualTo(0)
+            prop(Pair<Int, String>::second).isEqualTo("")
+        }
+
+        LinksMgr.entries.links.clear()
+
+        assertThat(view.parseArgs("4"), "parseArgs(4)").all {
+            prop(Pair<Int, String>::first).isEqualTo(0)
+            prop(Pair<Int, String>::second).isEqualTo("")
+        }
+    }
+}

From aab95fb0400495ad2de460554167174f32e8cb08 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 16 Nov 2021 22:04:41 -0800
Subject: [PATCH 234/262] Minor cleanups.

---
 .../kotlin/net/thauvin/erik/mobibot/FeedReader.kt     |  3 +--
 .../kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt |  1 -
 .../kotlin/net/thauvin/erik/mobibot/commands/Info.kt  |  3 +--
 .../kotlin/net/thauvin/erik/mobibot/commands/Say.kt   |  1 -
 .../kotlin/net/thauvin/erik/mobibot/commands/Users.kt |  1 -
 .../thauvin/erik/mobibot/commands/links/Comment.kt    | 11 ++++++-----
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index 739f45a..a61a6a7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -34,7 +34,6 @@ package net.thauvin.erik.mobibot
 import com.rometools.rome.io.FeedException
 import com.rometools.rome.io.SyndFeedInput
 import com.rometools.rome.io.XmlReader
-import net.thauvin.erik.mobibot.Utils.cyan
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.sendMessage
@@ -84,7 +83,7 @@ class FeedReader(private val url: String, val event: GenericMessageEvent) : Runn
                 } else {
                     items.take(maxItems).forEach {
                         messages.add(NoticeMessage(it.title))
-                        messages.add(NoticeMessage(helpFormat(it.link.cyan(), false)))
+                        messages.add(NoticeMessage(helpFormat(it.link.green(), false)))
                     }
                 }
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
index e5b019d..00d6638 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -47,7 +47,6 @@ class Cycle : AbstractCommand() {
     override val isPublic = false
     override val isVisible = true
 
-
     override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         with(event.bot()) {
             if (isChannelOp(channel, event)) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
index 8e54bf0..41065ff 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
@@ -33,7 +33,6 @@ package net.thauvin.erik.mobibot.commands
 
 import net.thauvin.erik.mobibot.ReleaseInfo
 import net.thauvin.erik.mobibot.Utils.capitalise
-import net.thauvin.erik.mobibot.Utils.cyan
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.isChannelOp
@@ -47,7 +46,7 @@ import java.lang.management.ManagementFactory
 
 class Info(private val tell: Tell) : AbstractCommand() {
     private val allVersions = listOf(
-        "${ReleaseInfo.PROJECT.capitalise()} ${ReleaseInfo.VERSION} (${ReleaseInfo.WEBSITE.cyan()})",
+        "${ReleaseInfo.PROJECT.capitalise()} ${ReleaseInfo.VERSION} (${ReleaseInfo.WEBSITE.green()})",
         "Written by ${ReleaseInfo.AUTHOR} (${ReleaseInfo.AUTHOR_URL.green()})"
     )
     override val name = "info"
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
index a89c64e..34b4aec 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
@@ -44,7 +44,6 @@ class Say : AbstractCommand() {
     override val isPublic = false
     override val isVisible = true
 
-
     override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         if (isChannelOp(channel, event)) {
             event.bot().sendIRC().message(channel, args)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
index 5133146..e643858 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
@@ -44,7 +44,6 @@ class Users : AbstractCommand() {
     override val isPublic = true
     override val isVisible = true
 
-
     override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         val nicks = mutableListOf<String>()
         val ch = event.bot().userChannelDao.getChannel(channel)
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 02f0a3c..5b137ff 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -38,7 +38,8 @@ import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.isChannelOp
 import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.commands.AbstractCommand
-import net.thauvin.erik.mobibot.entries.EntriesUtils
+import net.thauvin.erik.mobibot.entries.EntriesUtils.buildComment
+import net.thauvin.erik.mobibot.entries.EntriesUtils.buildLinkLabel
 import net.thauvin.erik.mobibot.entries.EntryLink
 import org.pircbotx.hooks.types.GenericMessageEvent
 
@@ -110,7 +111,7 @@ class Comment : AbstractCommand() {
         if (isChannelOp(channel, event) && cmd.length > 1) {
             val comment = entry.getComment(commentIndex)
             comment.nick = cmd.substring(1)
-            event.sendMessage(EntriesUtils.buildComment(entryIndex, commentIndex, comment))
+            event.sendMessage(buildComment(entryIndex, commentIndex, comment))
             LinksMgr.entries.save()
         } else {
             event.sendMessage("Please ask a channel op to change the author of this comment for you.")
@@ -126,7 +127,7 @@ class Comment : AbstractCommand() {
     ) {
         if (isChannelOp(channel, event) || event.user.nick == entry.getComment(commentIndex).nick) {
             entry.deleteComment(commentIndex)
-            event.sendMessage("Comment ${EntriesUtils.buildLinkLabel(entryIndex)}.${commentIndex + 1} removed.")
+            event.sendMessage("Comment ${buildLinkLabel(entryIndex)}.${commentIndex + 1} removed.")
             LinksMgr.entries.save()
         } else {
             event.sendMessage("Please ask a channel op to delete this comment for you.")
@@ -141,11 +142,11 @@ class Comment : AbstractCommand() {
         event: GenericMessageEvent
     ) {
         entry.setComment(commentIndex, cmd, event.user.nick)
-        event.sendMessage(EntriesUtils.buildComment(entryIndex, commentIndex, entry.getComment(commentIndex)))
+        event.sendMessage(buildComment(entryIndex, commentIndex, entry.getComment(commentIndex)))
         LinksMgr.entries.save()
     }
 
     private fun showComment(entry: EntryLink, entryIndex: Int, commentIndex: Int, event: GenericMessageEvent) {
-        event.sendMessage(EntriesUtils.buildComment(entryIndex, commentIndex, entry.getComment(commentIndex)))
+        event.sendMessage(buildComment(entryIndex, commentIndex, entry.getComment(commentIndex)))
     }
 }

From 655889d2b999fb7b4b498d24390fcc33b2178f0a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 16 Nov 2021 22:07:31 -0800
Subject: [PATCH 235/262] Use filters instead of looping through all messages.

---
 .../erik/mobibot/commands/tell/Tell.kt        | 170 ++++++++----------
 1 file changed, 74 insertions(+), 96 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index f66ba2b..b18327f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -61,62 +61,6 @@ class Tell(private val serialObject: String) : AbstractCommand() {
     // Message maximum queue size
     private var maxSize = 50
 
-    /**
-     * Cleans the messages queue.
-     */
-    private fun clean(): Boolean {
-        // if (bot.logger.isDebugEnabled) bot.logger.debug("Cleaning the messages.")
-        return TellMessagesMgr.clean(messages, maxDays.toLong())
-    }
-
-    // Delete message.
-    private fun deleteMessage(channel: String, args: String, event: GenericMessageEvent) {
-        val split = args.split(" ")
-        if (split.size == 2) {
-            val id = split[1]
-            var deleted = false
-            if (TELL_ALL_KEYWORD.equals(id, ignoreCase = true)) {
-                for (message in messages) {
-                    if (message.sender.equals(event.user.nick, ignoreCase = true) && message.isReceived) {
-                        messages.remove(message)
-                        deleted = true
-                    }
-                }
-                if (deleted) {
-                    save()
-                    event.sendMessage("Delivered messages have been deleted.")
-                } else {
-                    event.sendMessage("No delivered messages were found.")
-                }
-            } else {
-                var found = false
-                for (message in messages) {
-                    found = (message.id == id)
-                    if (found && (message.sender.equals(event.user.nick, ignoreCase = true) || isChannelOp(
-                            channel,
-                            event
-                        ))
-                    ) {
-                        messages.remove(message)
-                        save()
-                        event.sendMessage("Your message was deleted from the queue.")
-                        deleted = true
-                        break
-                    }
-                }
-                if (!deleted) {
-                    if (found) {
-                        event.sendMessage("Only messages that you sent can be deleted.")
-                    } else {
-                        event.sendMessage("The specified message [ID $id] could not be found.")
-                    }
-                }
-            }
-        } else {
-            helpResponse(channel, args, event)
-        }
-    }
-
     /**
      * The tell command.
      */
@@ -127,12 +71,20 @@ class Tell(private val serialObject: String) : AbstractCommand() {
         helpFormat("%c $name <nick> <message>"),
         "To view queued and sent messages:",
         helpFormat("%c $name ${View.VIEW_CMD}"),
-        "Messages are kept for ${bold(maxDays)}" + " day".plural(maxDays.toLong()) + '.'
+        "Messages are kept for ${maxDays.bold()}" + " day".plural(maxDays.toLong()) + '.'
     )
     override val isOpOnly: Boolean = false
     override val isPublic: Boolean = isEnabled()
     override val isVisible: Boolean = isEnabled()
 
+    /**
+     * Cleans the messages queue.
+     */
+    private fun clean(): Boolean {
+        // if (bot.logger.isDebugEnabled) bot.logger.debug("Cleaning the messages.")
+        return TellMessagesMgr.clean(messages, maxDays.toLong())
+    }
+
     override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         if (isEnabled()) {
             if (args.isBlank()) {
@@ -154,6 +106,34 @@ class Tell(private val serialObject: String) : AbstractCommand() {
         }
     }
 
+    // Delete message.
+    private fun deleteMessage(channel: String, args: String, event: GenericMessageEvent) {
+        val split = args.split(" ")
+        if (split.size == 2) {
+            val id = split[1]
+            if (TELL_ALL_KEYWORD.equals(id, ignoreCase = true)) {
+                if (messages.removeIf { it.sender.equals(event.user.nick, true) && it.isReceived }) {
+                    save()
+                    event.sendMessage("Delivered messages have been deleted.")
+                } else {
+                    event.sendMessage("No delivered messages were found.")
+                }
+            } else {
+                if (messages.removeIf {
+                        it.id == id &&
+                                (it.sender.equals(event.user.nick, true) || isChannelOp(channel, event))
+                    }) {
+                    save()
+                    event.sendMessage("The message was deleted from the queue.")
+                } else {
+                    event.sendMessage("The specified message [ID $id] could not be found.")
+                }
+            }
+        } else {
+            helpResponse(channel, args, event)
+        }
+    }
+
     override fun isEnabled(): Boolean {
         return maxSize > 0 && maxDays > 0
     }
@@ -175,7 +155,7 @@ class Tell(private val serialObject: String) : AbstractCommand() {
                 val message = TellMessage(event.user.nick, split[0], split[1].trim())
                 messages.add(message)
                 save()
-                event.sendMessage("Message [ID ${message.id}] was queued for ${bold(message.recipient)}")
+                event.sendMessage("Message [ID ${message.id}] was queued for ${message.recipient.bold()}")
             } else {
                 event.sendMessage("Sorry, the messages queue is currently full.")
             }
@@ -197,36 +177,35 @@ class Tell(private val serialObject: String) : AbstractCommand() {
     fun send(event: GenericUserEvent) {
         val nickname = event.user.nick
         if (isEnabled() && nickname != event.getBot<PircBotX>().nick) {
-            messages.stream().filter { message: TellMessage -> message.isMatch(nickname) }
-                .forEach { message: TellMessage ->
-                    if (message.recipient.equals(nickname, ignoreCase = true) && !message.isReceived) {
-                        if (message.sender == nickname) {
-                            if (event !is MessageEvent) {
-                                event.user.send().message(
-                                    "${bold("You")} wanted me to remind you: ${reverseColor(message.message)}"
-                                )
-                                message.isReceived = true
-                                message.isNotified = true
-                                save()
-                            }
-                        } else {
+            messages.filter { it.isMatch(nickname) }.forEach { message ->
+                if (message.recipient.equals(nickname, ignoreCase = true) && !message.isReceived) {
+                    if (message.sender == nickname) {
+                        if (event !is MessageEvent) {
                             event.user.send().message(
-                                "${message.sender} wanted me to tell you: ${reverseColor(message.message)}"
+                                "${"You".bold()} wanted me to remind you: ${message.message.reverseColor()}"
                             )
                             message.isReceived = true
+                            message.isNotified = true
                             save()
                         }
-                    } else if (message.sender.equals(nickname, ignoreCase = true) && message.isReceived
-                        && !message.isNotified
-                    ) {
+                    } else {
                         event.user.send().message(
-                            "Your message ${reverseColor("[ID ${message.id}]")} was sent to "
-                                    + "${bold(message.recipient)} on ${message.receptionDate}"
+                            "${message.sender} wanted me to tell you: ${message.message.reverseColor()}"
                         )
-                        message.isNotified = true
+                        message.isReceived = true
                         save()
                     }
+                } else if (message.sender.equals(nickname, ignoreCase = true) && message.isReceived
+                    && !message.isNotified
+                ) {
+                    event.user.send().message(
+                        "Your message ${"[ID ${message.id}]".reverseColor()} was sent to "
+                                + "${message.recipient.bold()} on ${message.receptionDate}"
+                    )
+                    message.isNotified = true
+                    save()
                 }
+            }
         }
     }
 
@@ -242,7 +221,7 @@ class Tell(private val serialObject: String) : AbstractCommand() {
         if (messages.isNotEmpty()) {
             for (message in messages) {
                 event.sendMessage(
-                    "${bold(message.sender)}$ARROW${bold(message.recipient)} [ID: ${message.id}, " +
+                    "${message.sender.bold()}$ARROW${message.recipient.bold()} [ID: ${message.id}, " +
                             (if (message.isReceived) "DELIVERED]" else "QUEUED]")
                 )
             }
@@ -254,24 +233,23 @@ class Tell(private val serialObject: String) : AbstractCommand() {
     // View messages.
     private fun viewMessages(event: GenericMessageEvent) {
         var hasMessage = false
-        for (message in messages) {
-            if (message.isMatch(event.user.nick)) {
-                if (!hasMessage) {
-                    hasMessage = true; event.sendMessage("Here are your messages: ")
-                }
-                if (message.isReceived) {
-                    event.sendMessage(
-                        bold(message.sender) + ARROW + bold(message.recipient) +
-                                " [${message.receptionDate.toUtcDateTime()}, ID: ${bold(message.id)}, DELIVERED]"
-                    )
-                } else {
-                    event.sendMessage(
-                        bold(message.sender) + ARROW + bold(message.recipient) +
-                                " [${message.queued.toUtcDateTime()}, ID: ${bold(message.id)}, QUEUED]"
-                    )
-                }
-                event.sendMessage(helpFormat(message.message))
+        for (message in messages.filter { it.isMatch(event.user.nick) }) {
+            if (!hasMessage) {
+                hasMessage = true
+                event.sendMessage("Here are your messages: ")
             }
+            if (message.isReceived) {
+                event.sendMessage(
+                    message.sender.bold() + ARROW + message.recipient.bold() +
+                            " [${message.receptionDate.toUtcDateTime()}, ID: ${message.id.bold()}, DELIVERED]"
+                )
+            } else {
+                event.sendMessage(
+                    message.sender.bold() + ARROW + message.recipient.bold() +
+                            " [${message.queued.toUtcDateTime()}, ID: ${message.id.bold()}, QUEUED]"
+                )
+            }
+            event.sendMessage(helpFormat(message.message))
         }
         if (!hasMessage) {
             event.sendMessage("You have no messages in the queue.")

From ede05c39df3fd6a25285f8d8a7f581d8c8a998a4 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 16 Nov 2021 22:08:38 -0800
Subject: [PATCH 236/262] Upgraded to Kotlin 1.6.0. Trying out Kover instead of
 Jacoco.

---
 .idea/jarRepositories.xml |  5 +++++
 build.gradle              | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 75b7aaa..7164ee5 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,10 @@
       <option name="name" value="maven" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://packages.jetbrains.team/maven/p/ij/intellij-dependencies" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b6edcf7..323deeb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,9 @@ plugins {
     id 'jacoco'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.6.0-RC2'
-    id 'org.jetbrains.kotlin.kapt' version '1.6.0-RC2'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.0'
+    id 'org.jetbrains.kotlin.kapt' version '1.6.0'
+    id 'org.jetbrains.kotlinx.kover' version '0.4.2'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -59,7 +60,7 @@ dependencies {
 
     implementation 'net.aksingh:owm-japis:2.5.3.0'
     implementation 'com.google.code.gson:gson:2.8.9'
-    
+
     implementation 'net.objecthunter:exp4j:0.4.8'
 
     implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
@@ -154,6 +155,7 @@ incrementBuildMeta {
 
 sonarqube {
     properties {
+        property('sonar.jacoco.reportPaths', "$buildDir/reports/kover/report.xml")
         property('sonar.organization', 'ethauvin-github')
         property('sonar.projectKey', 'ethauvin_mobibot')
         property('sonar.host.url', 'https://sonarcloud.io')
@@ -173,7 +175,7 @@ jacocoTestReport {
 }
 
 tasks.sonarqube {
-    dependsOn 'jacocoTestReport'
+    dependsOn 'koverReport'
 }
 
 task copyToDeploy(type: Copy) {

From e462a701475cc147c3d22178d99f8e1db79eedca Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 16 Nov 2021 22:16:17 -0800
Subject: [PATCH 237/262] Reverted back to Jacoco reports for Sonarqube.

---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 323deeb..53ec183 100644
--- a/build.gradle
+++ b/build.gradle
@@ -155,7 +155,6 @@ incrementBuildMeta {
 
 sonarqube {
     properties {
-        property('sonar.jacoco.reportPaths', "$buildDir/reports/kover/report.xml")
         property('sonar.organization', 'ethauvin-github')
         property('sonar.projectKey', 'ethauvin_mobibot')
         property('sonar.host.url', 'https://sonarcloud.io')
@@ -175,7 +174,7 @@ jacocoTestReport {
 }
 
 tasks.sonarqube {
-    dependsOn 'koverReport'
+    dependsOn 'jacocoTestReport'
 }
 
 task copyToDeploy(type: Copy) {

From 7c270ed8729cb70e5eab0aa1769eb7a37e1dacea Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 17 Nov 2021 08:05:45 -0800
Subject: [PATCH 238/262] Added more tests.

---
 build.gradle                                  |  3 ++-
 .../erik/mobibot/commands/links/View.kt       | 10 ++++----
 .../erik/mobibot/commands/links/ViewTest.kt   | 24 +++++++++++++++++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 53ec183..3d1220c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -158,6 +158,7 @@ sonarqube {
         property('sonar.organization', 'ethauvin-github')
         property('sonar.projectKey', 'ethauvin_mobibot')
         property('sonar.host.url', 'https://sonarcloud.io')
+        property('sonar.coverage.jacoco.xmlReportPaths', "${project.buildDir}/reports/kover/report.xml")
     }
 }
 
@@ -174,7 +175,7 @@ jacocoTestReport {
 }
 
 tasks.sonarqube {
-    dependsOn 'jacocoTestReport'
+    dependsOn 'koverReport'
 }
 
 task copyToDeploy(type: Copy) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
index c9021fb..9ec9f70 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -44,7 +44,6 @@ import org.pircbotx.hooks.events.PrivateMessageEvent
 import org.pircbotx.hooks.types.GenericMessageEvent
 
 class View : AbstractCommand() {
-    private val maxEntries = 6
     override val name = VIEW_CMD
     override val help = listOf(
         "To list or search the current URL posts:",
@@ -55,6 +54,7 @@ class View : AbstractCommand() {
     override val isVisible = true
 
     companion object {
+        const val MAX_ENTRIES = 6
         const val VIEW_CMD = "view"
     }
 
@@ -70,8 +70,8 @@ class View : AbstractCommand() {
     internal fun parseArgs(args: String): Pair<Int, String> {
         var query = args.lowercase().trim()
         var start = 0
-        if (query.isEmpty() && entries.links.size > maxEntries) {
-            start = entries.links.size - maxEntries
+        if (query.isEmpty() && entries.links.size > MAX_ENTRIES) {
+            start = entries.links.size - MAX_ENTRIES
         }
         if (query.matches("^\\d+(| .*)".toRegex())) { // view [<start>] [<query>]
             val split = query.split(" ", limit = 2)
@@ -96,7 +96,7 @@ class View : AbstractCommand() {
         var index = start
         var entry: EntryLink
         var sent = 0
-        while (index < entries.links.size && sent < maxEntries) {
+        while (index < entries.links.size && sent < MAX_ENTRIES) {
             entry = entries.links[index]
             if (query.isNotBlank()) {
                 if (entry.matches(query)) {
@@ -108,7 +108,7 @@ class View : AbstractCommand() {
                 sent++
             }
             index++
-            if (sent == maxEntries && index < entries.links.size) {
+            if (sent == MAX_ENTRIES && index < entries.links.size) {
                 event.sendMessage("To view more, try: ")
                 event.sendMessage(
                     helpFormat(
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt
index a239dfd..dae5cb4 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt
@@ -44,7 +44,7 @@ class ViewTest {
     fun testParseArgs() {
         val view = View()
 
-        for (i in 1..3) {
+        for (i in 1..10) {
             LinksMgr.entries.links.add(
                 EntryLink(
                     "https://www.example.com/$i",
@@ -77,8 +77,28 @@ class ViewTest {
             prop(Pair<Int, String>::second).isEqualTo("foo bar")
         }
 
-        assertThat(view.parseArgs("5"), "parseArgs(5)").all {
+        assertThat(view.parseArgs("foo bar"), "parseArgs(foo bar)").all {
             prop(Pair<Int, String>::first).isEqualTo(0)
+            prop(Pair<Int, String>::second).isEqualTo("foo bar")
+        }
+
+        assertThat(view.parseArgs("${Int.MAX_VALUE}1"), "parseArgs(overflow)").all {
+            prop(Pair<Int, String>::first).isEqualTo(0)
+            prop(Pair<Int, String>::second).isEqualTo("${Int.MAX_VALUE}1")
+        }
+
+        assertThat(view.parseArgs("1a"), "parseArgs(1a)").all {
+            prop(Pair<Int, String>::first).isEqualTo(0)
+            prop(Pair<Int, String>::second).isEqualTo("1a")
+        }
+
+        assertThat(view.parseArgs("20"), "parseArgs(20)").all {
+            prop(Pair<Int, String>::first).isEqualTo(0)
+            prop(Pair<Int, String>::second).isEqualTo("")
+        }
+
+        assertThat(view.parseArgs(""), "parseArgs()").all {
+            prop(Pair<Int, String>::first).isEqualTo(LinksMgr.entries.links.size - View.MAX_ENTRIES)
             prop(Pair<Int, String>::second).isEqualTo("")
         }
 

From 4e1e09b069b7f5e1a33ea304408e54a1fe4a220e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 28 Nov 2021 23:17:35 -0800
Subject: [PATCH 239/262] Switched uptime to Duration API.

---
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  | 104 ++++++++++--------
 1 file changed, 56 insertions(+), 48 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 0d220c8..835125d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -49,8 +49,9 @@ import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.util.Date
 import java.util.Properties
-import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 /**
  * Miscellaneous utilities.
@@ -64,7 +65,7 @@ object Utils {
      */
     @JvmStatic
     fun String.appendIfMissing(suffix: Char): String {
-        return if (this.last() != suffix) {
+        return if (last() != suffix) {
             "$this${suffix}"
         } else {
             this
@@ -75,19 +76,19 @@ object Utils {
      * Makes the given int bold.
      */
     @JvmStatic
-    fun Int.bold(): String = this.toString().bold()
+    fun Int.bold(): String = toString().bold()
 
     /**
      * Makes the given long bold.
      */
     @JvmStatic
-    fun Long.bold(): String = this.toString().bold()
+    fun Long.bold(): String = toString().bold()
 
     /**
      * Makes the given string bold.
      */
     @JvmStatic
-    fun String?.bold(): String = this.colorize(Colors.BOLD)
+    fun String?.bold(): String = colorize(Colors.BOLD)
 
     /**
      * Returns the [PircBotX] instance.
@@ -110,7 +111,7 @@ object Utils {
      * Capitalize a string.
      */
     @JvmStatic
-    fun String.capitalise(): String = this.lowercase().replaceFirstChar { it.uppercase() }
+    fun String.capitalise(): String = lowercase().replaceFirstChar { it.uppercase() }
 
     /**
      * Capitalize words
@@ -123,7 +124,7 @@ object Utils {
      */
     @JvmStatic
     fun String?.colorize(color: String): String {
-        return if (this.isNullOrEmpty()) {
+        return if (isNullOrEmpty()) {
             ""
         } else if (color == DEFAULT_COLOR) {
             this
@@ -138,7 +139,7 @@ object Utils {
      * Makes the given string cyan.
      */
     @JvmStatic
-    fun String?.cyan(): String = this.colorize(Colors.CYAN)
+    fun String?.cyan(): String = colorize(Colors.CYAN)
 
     /**
      * URL encodes the given string.
@@ -151,14 +152,14 @@ object Utils {
      */
     @JvmStatic
     fun Properties.getIntProperty(key: String, defaultValue: Int): Int {
-        return this.getProperty(key)?.toIntOrDefault(defaultValue) ?: defaultValue
+        return getProperty(key)?.toIntOrDefault(defaultValue) ?: defaultValue
     }
 
     /**
      * Makes the given string green.
      */
     @JvmStatic
-    fun String?.green(): String = this.colorize(Colors.DARK_GREEN)
+    fun String?.green(): String = colorize(Colors.DARK_GREEN)
 
     /**
      * Returns a formatted help string.
@@ -178,13 +179,23 @@ object Utils {
         return event.bot().userChannelDao.getChannel(channel).isOp(event.user)
     }
 
+    /**
+     * Return the last item of a list of strings or empty if none.
+     */
+    fun List<String>.lastOrEmpty() : String {
+        return if (this.size >= 2) {
+            this.last()
+        } else
+            ""
+    }
+
     /**
      * Obfuscates the given string.
      */
     @JvmStatic
     fun String.obfuscate(): String {
-        return if (this.isNotBlank()) {
-            "x".repeat(this.length)
+        return if (isNotBlank()) {
+            "x".repeat(length)
         } else this
     }
 
@@ -200,7 +211,7 @@ object Utils {
      * Makes the given string red.
      */
     @JvmStatic
-    fun String?.red(): String = this.colorize(Colors.RED)
+    fun String?.red(): String = colorize(Colors.RED)
 
     /**
      * Replaces all occurrences of Strings within another String.
@@ -220,7 +231,7 @@ object Utils {
      * Makes the given string reverse color.
      */
     @JvmStatic
-    fun String?.reverseColor(): String = this.colorize(Colors.REVERSE)
+    fun String?.reverseColor(): String = colorize(Colors.REVERSE)
 
     /**
      * Send a formatted commands/modules, etc. list.
@@ -284,7 +295,7 @@ object Utils {
     @JvmStatic
     fun String.toIntOrDefault(defaultValue: Int): Int {
         return try {
-            this.toInt()
+            toInt()
         } catch (e: NumberFormatException) {
             defaultValue
         }
@@ -295,28 +306,28 @@ object Utils {
      */
     @JvmStatic
     fun Date.toIsoLocalDate(): String {
-        return LocalDateTime.ofInstant(this.toInstant(), ZoneId.systemDefault()).toIsoLocalDate()
+        return LocalDateTime.ofInstant(toInstant(), ZoneId.systemDefault()).toIsoLocalDate()
     }
 
     /**
      * Returns the specified date as an ISO local date string.
      */
     @JvmStatic
-    fun LocalDateTime.toIsoLocalDate(): String = this.format(DateTimeFormatter.ISO_LOCAL_DATE)
+    fun LocalDateTime.toIsoLocalDate(): String = format(DateTimeFormatter.ISO_LOCAL_DATE)
 
     /**
      * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
      */
     @JvmStatic
     fun Date.toUtcDateTime(): String {
-        return LocalDateTime.ofInstant(this.toInstant(), ZoneId.systemDefault()).toUtcDateTime()
+        return LocalDateTime.ofInstant(toInstant(), ZoneId.systemDefault()).toUtcDateTime()
     }
 
     /**
      * Returns the specified date formatted as `yyyy-MM-dd HH:mm`.
      */
     @JvmStatic
-    fun LocalDateTime.toUtcDateTime(): String = this.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+    fun LocalDateTime.toUtcDateTime(): String = format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
 
     /**
      * Converts XML/XHTML entities to plain text.
@@ -329,38 +340,35 @@ object Utils {
      */
     @JvmStatic
     fun uptime(uptime: Long): String {
-        val info = StringBuilder()
-        var days = TimeUnit.MILLISECONDS.toDays(uptime)
-        val years = days / 365
-        days %= 365
-        val months = days / 30
-        days %= 30
-        val weeks = days / 7
-        days %= 7
-        val hours = TimeUnit.MILLISECONDS.toHours(uptime) - TimeUnit.DAYS.toHours(TimeUnit.MILLISECONDS.toDays(uptime))
-        val minutes =
-            TimeUnit.MILLISECONDS.toMinutes(uptime) - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(uptime))
+        uptime.toDuration(DurationUnit.MILLISECONDS).toComponents { wholeDays, hours, minutes, _, _ ->
+            val years = wholeDays / 365
+            var days = wholeDays % 365
+            val months = days / 30
+            days %= 30
+            val weeks = days / 7
+            days %= 7
 
-        with(info) {
-            if (years > 0) {
-                append(years).append(" year".plural(years)).append(' ')
-            }
-            if (months > 0) {
-                append(weeks).append(" month".plural(months)).append(' ')
-            }
-            if (weeks > 0) {
-                append(weeks).append(" week".plural(weeks)).append(' ')
-            }
-            if (days > 0) {
-                append(days).append(" day".plural(days)).append(' ')
-            }
-            if (hours > 0) {
-                append(hours).append(" hour".plural(hours)).append(' ')
-            }
+            with(StringBuffer()) {
+                if (years > 0) {
+                    append(years).append(" year".plural(years)).append(' ')
+                }
+                if (months > 0) {
+                    append(weeks).append(" month".plural(months)).append(' ')
+                }
+                if (weeks > 0) {
+                    append(weeks).append(" week".plural(weeks)).append(' ')
+                }
+                if (days > 0) {
+                    append(days).append(" day".plural(days)).append(' ')
+                }
+                if (hours > 0) {
+                    append(hours).append(" hour".plural(hours.toLong())).append(' ')
+                }
 
-            append(minutes).append(" minute".plural(minutes))
+                append(minutes).append(" minute".plural(minutes.toLong()))
 
-            return toString()
+                return toString()
+            }
         }
     }
 

From 10f1ee8518780073477a89e5864322f3714563cb Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 28 Nov 2021 23:18:28 -0800
Subject: [PATCH 240/262] Cleaned up constructors.

---
 .../erik/mobibot/commands/tell/TellMessage.kt |  2 +-
 .../thauvin/erik/mobibot/entries/EntryLink.kt | 32 +++++++------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
index eb058b7..f1bdabd 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
@@ -39,7 +39,7 @@ import java.time.format.DateTimeFormatter
 /**
  * The `TellMessage` class.
  */
-class TellMessage internal constructor(
+class TellMessage(
     /**
      * Returns the message's sender.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
index d7730a5..da8ef87 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -41,31 +41,31 @@ import java.util.Date
 /**
  * The class used to store link entries.
  */
-class EntryLink : Serializable {
+class EntryLink(
     // Link's comments
-    val comments: MutableList<EntryComment> = mutableListOf()
+    val comments: MutableList<EntryComment> = mutableListOf(),
 
     // Tags/categories
-    val tags: MutableList<SyndCategory> = mutableListOf()
+    val tags: MutableList<SyndCategory> = mutableListOf(),
 
     // Channel
-    var channel: String
+    var channel: String,
 
     // Creation date
-    var date: Date = Calendar.getInstance().time
+    var date: Date = Calendar.getInstance().time,
 
     // Link's URL
-    var link: String
+    var link: String,
 
     // Author's login
-    var login = ""
+    var login: String = "",
 
     // Author's nickname
-    var nick: String
+    var nick: String,
 
     // Link's title
     var title: String
-
+) : Serializable {
     /**
      * Creates a new entry.
      */
@@ -76,12 +76,7 @@ class EntryLink : Serializable {
         login: String,
         channel: String,
         tags: List<String?>
-    ) {
-        this.link = link
-        this.title = title
-        this.nick = nick
-        this.login = login
-        this.channel = channel
+    ) : this(link = link, title = title, nick = nick, login = login, channel = channel) {
         setTags(tags)
     }
 
@@ -95,12 +90,7 @@ class EntryLink : Serializable {
         channel: String,
         date: Date,
         tags: List<SyndCategory>
-    ) {
-        this.link = link
-        this.title = title
-        this.nick = nick
-        this.channel = channel
-        this.date = Date(date.time)
+    ) : this(link = link, title = title, nick = nick, channel = channel, date = Date(date.time)) {
         this.tags.addAll(tags)
     }
 

From 97a9fd15973e4a641b5364231a6b5339637935fb Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 28 Nov 2021 23:24:14 -0800
Subject: [PATCH 241/262] Added lastOrEmpty() extension function.

---
 .../kotlin/net/thauvin/erik/mobibot/Mobibot.kt    | 15 ++++-----------
 .../thauvin/erik/mobibot/commands/links/View.kt   |  7 ++-----
 .../kotlin/net/thauvin/erik/mobibot/UtilsTest.kt  |  9 +++++++++
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index ec571f7..bee3340 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -36,6 +36,7 @@ import net.thauvin.erik.mobibot.Utils.appendIfMissing
 import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.isChannelOp
+import net.thauvin.erik.mobibot.Utils.lastOrEmpty
 import net.thauvin.erik.mobibot.Utils.sendList
 import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.Utils.toIsoLocalDate
@@ -106,7 +107,7 @@ import java.util.regex.Pattern
 import kotlin.system.exitProcess
 
 @Version(properties = "version.properties", className = "ReleaseInfo", template = "version.mustache", type = "kt")
-class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Properties) : ListenerAdapter() {
+class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Properties) : ListenerAdapter() {
     // The bot configuration.
     private val config: Configuration
 
@@ -116,9 +117,6 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
     // Tell module
     private val tell: Tell
 
-    /** Main channel. */
-    val channel: String
-
     /** Logger. */
     val logger: Logger = LoggerFactory.getLogger(Mobibot::class.java)
 
@@ -185,9 +183,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
             if (logger.isTraceEnabled) logger.trace("<<< ${user.nick}: ${event.message}")
             val cmds = event.message.trim().split(" ".toRegex(), 2)
             val cmd = cmds[0].lowercase()
-            val args = if (cmds.size > 1) {
-                cmds[1].trim()
-            } else ""
+            val args = cmds.lastOrEmpty().trim()
             if (cmd.startsWith(Constants.HELP_CMD)) { // help
                 helpResponse(event, args)
             } else if (!addons.exec(channel, cmd, args, event)) { // Execute command or module
@@ -217,9 +213,7 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
                 if (logger.isTraceEnabled) logger.trace(">>> $sender: $message")
                 val cmds = message.substring(message.indexOf(':') + 1).trim().split(" ".toRegex(), 2)
                 val cmd = cmds[0].lowercase()
-                val args = if (cmds.size > 1) {
-                    cmds[1].trim()
-                } else ""
+                val args = cmds.lastOrEmpty().trim()
                 if (cmd.startsWith(Constants.HELP_CMD)) { // mobibot: help
                     helpResponse(event, args)
                 } else {
@@ -354,7 +348,6 @@ class Mobibot(nickname: String, channel: String, logsDirPath: String, p: Propert
      * Initialize the bot.
      */
     init {
-        this.channel = channel
         val ircServer = p.getProperty("server", Constants.DEFAULT_SERVER)
         config = Configuration.Builder().apply {
             name = nickname
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
index 9ec9f70..e3b731e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -35,6 +35,7 @@ package net.thauvin.erik.mobibot.commands.links
 import net.thauvin.erik.mobibot.Utils.bot
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.lastOrEmpty
 import net.thauvin.erik.mobibot.Utils.sendMessage
 import net.thauvin.erik.mobibot.commands.AbstractCommand
 import net.thauvin.erik.mobibot.commands.links.LinksMgr.Companion.entries
@@ -77,11 +78,7 @@ class View : AbstractCommand() {
             val split = query.split(" ", limit = 2)
             try {
                 start = split[0].toInt() - 1
-                query = if (split.size == 2) {
-                    split[1].trim()
-                } else {
-                    ""
-                }
+                query = split.lastOrEmpty().trim()
                 if (start > entries.links.size) {
                     start = 0
                 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 92ac36f..0cc1b41 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -46,6 +46,7 @@ import net.thauvin.erik.mobibot.Utils.encodeUrl
 import net.thauvin.erik.mobibot.Utils.getIntProperty
 import net.thauvin.erik.mobibot.Utils.green
 import net.thauvin.erik.mobibot.Utils.helpFormat
+import net.thauvin.erik.mobibot.Utils.lastOrEmpty
 import net.thauvin.erik.mobibot.Utils.obfuscate
 import net.thauvin.erik.mobibot.Utils.plural
 import net.thauvin.erik.mobibot.Utils.red
@@ -187,6 +188,14 @@ class UtilsTest {
         assertThat(localDateTime.toIsoLocalDate(), "isoLocalDate(localDate)").isEqualTo("1952-02-17")
     }
 
+    @Test
+    fun testLastOrEmpty() {
+        val two = listOf("1", "2")
+        assertThat(two.lastOrEmpty(), "two").isEqualTo("2")
+        val one = listOf("1")
+        assertThat(one.lastOrEmpty(), "one").isEqualTo("")
+    }
+
     @Test
     fun testObfuscate() {
         assertThat(ascii.obfuscate(), "obfuscate()").all {

From 35d8be009ec73b10587414c76b31f096799300eb Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 28 Nov 2021 23:26:31 -0800
Subject: [PATCH 242/262] Switched to buildList/Map.

---
 .../erik/mobibot/modules/CurrencyConverter.kt |   7 +-
 .../thauvin/erik/mobibot/modules/WorldTime.kt | 544 +++++++++---------
 2 files changed, 273 insertions(+), 278 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 915aa49..16687f6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -180,9 +180,10 @@ class CurrencyConverter : ThreadedModule() {
 
         @JvmStatic
         fun currencyRates(): List<String> {
-            val rates = mutableListOf<String>()
-            for ((key, value) in EXCHANGE_RATES.toSortedMap()) {
-                rates.add("$key: ${value.padStart(8)}")
+            val rates = buildList {
+                for ((key, value) in EXCHANGE_RATES.toSortedMap()) {
+                    add("$key: ${value.padStart(8)}")
+                }
             }
             return rates
         }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 5d9fcde..7abe820 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -40,7 +40,6 @@ import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.temporal.ChronoField
-import java.util.Collections
 
 /**
  * The WorldTime module.
@@ -51,7 +50,275 @@ class WorldTime : AbstractModule() {
         const val BEATS_KEYWORD = ".beats"
 
         // Supported countries
-        var COUNTRIES_MAP: Map<String, String>
+        val COUNTRIES_MAP = buildMap<String, String> {
+            put("AG", "America/Antigua")
+            put("AI", "America/Anguilla")
+            put("AE", "Asia/Dubai")
+            put("AD", "Europe/Andorra")
+            put("AKDT", "America/Anchorage")
+            put("AF", "Asia/Kabul")
+            put("AKST", "America/Anchorage")
+            put("AL", "Europe/Tirane")
+            put("AM", "Asia/Yerevan")
+            put("AO", "Africa/Luanda")
+            put("AQ", "Antarctica/South_Pole")
+            put("AR", "America/Argentina/Buenos_Aires")
+            put("AS", "Pacific/Pago_Pago")
+            put("AT", "Europe/Vienna")
+            put("AU", "Australia/Sydney")
+            put("AW", "America/Aruba")
+            put("AX", "Europe/Mariehamn")
+            put("AZ", "Asia/Baku")
+            put("BA", "Europe/Sarajevo")
+            put("BB", "America/Barbados")
+            put("BD", "Asia/Dhaka")
+            put("BE", "Europe/Brussels")
+            put("BEAT", BEATS_KEYWORD)
+            put("BF", "Africa/Ouagadougou")
+            put("BG", "Europe/Sofia")
+            put("BH", "Asia/Bahrain")
+            put("BI", "Africa/Bujumbura")
+            put("BJ", "Africa/Porto-Novo")
+            put("BL", "America/St_Barthelemy")
+            put("BM", "Atlantic/Bermuda")
+            put("BMT", BEATS_KEYWORD)
+            put("BN", "Asia/Brunei")
+            put("BO", "America/La_Paz")
+            put("BQ", "America/Kralendijk")
+            put("BR", "America/Sao_Paulo")
+            put("BS", "America/Nassau")
+            put("BT", "Asia/Thimphu")
+            put("BW", "Africa/Gaborone")
+            put("BY", "Europe/Minsk")
+            put("BZ", "America/Belize")
+            put("CA", "America/Montreal")
+            put("CC", "Indian/Cocos")
+            put("CD", "Africa/Kinshasa")
+            put("CDT", "America/Chicago")
+            put("CET", "CET")
+            put("CF", "Africa/Bangui")
+            put("CG", "Africa/Brazzaville")
+            put("CH", "Europe/Zurich")
+            put("CI", "Africa/Abidjan")
+            put("CK", "Pacific/Rarotonga")
+            put("CL", "America/Santiago")
+            put("CM", "Africa/Douala")
+            put("CN", "Asia/Shanghai")
+            put("CO", "America/Bogota")
+            put("CR", "America/Costa_Rica")
+            put("CST", "America/Chicago")
+            put("CU", "Cuba")
+            put("CV", "Atlantic/Cape_Verde")
+            put("CW", "America/Curacao")
+            put("CX", "Indian/Christmas")
+            put("CY", "Asia/Nicosia")
+            put("CZ", "Europe/Prague")
+            put("DE", "Europe/Berlin")
+            put("DJ", "Africa/Djibouti")
+            put("DK", "Europe/Copenhagen")
+            put("DM", "America/Dominica")
+            put("DO", "America/Santo_Domingo")
+            put("DZ", "Africa/Algiers")
+            put("EC", "Pacific/Galapagos")
+            put("EDT", "America/New_York")
+            put("EE", "Europe/Tallinn")
+            put("EG", "Africa/Cairo")
+            put("EH", "Africa/El_Aaiun")
+            put("ER", "Africa/Asmara")
+            put("ES", "Europe/Madrid")
+            put("EST", "America/New_York")
+            put("ET", "Africa/Addis_Ababa")
+            put("FI", "Europe/Helsinki")
+            put("FJ", "Pacific/Fiji")
+            put("FK", "Atlantic/Stanley")
+            put("FM", "Pacific/Yap")
+            put("FO", "Atlantic/Faroe")
+            put("FR", "Europe/Paris")
+            put("GA", "Africa/Libreville")
+            put("GB", "Europe/London")
+            put("GD", "America/Grenada")
+            put("GE", "Asia/Tbilisi")
+            put("GF", "America/Cayenne")
+            put("GG", "Europe/Guernsey")
+            put("GH", "Africa/Accra")
+            put("GI", "Europe/Gibraltar")
+            put("GL", "America/Thule")
+            put("GM", "Africa/Banjul")
+            put("GMT", "GMT")
+            put("GN", "Africa/Conakry")
+            put("GP", "America/Guadeloupe")
+            put("GQ", "Africa/Malabo")
+            put("GR", "Europe/Athens")
+            put("GS", "Atlantic/South_Georgia")
+            put("GT", "America/Guatemala")
+            put("GU", "Pacific/Guam")
+            put("GW", "Africa/Bissau")
+            put("GY", "America/Guyana")
+            put("HK", "Asia/Hong_Kong")
+            put("HN", "America/Tegucigalpa")
+            put("HR", "Europe/Zagreb")
+            put("HST", "Pacific/Honolulu")
+            put("HT", "America/Port-au-Prince")
+            put("HU", "Europe/Budapest")
+            put("ID", "Asia/Jakarta")
+            put("IE", "Europe/Dublin")
+            put("IL", "Asia/Tel_Aviv")
+            put("IM", "Europe/Isle_of_Man")
+            put("IN", "Asia/Kolkata")
+            put("IO", "Indian/Chagos")
+            put("IQ", "Asia/Baghdad")
+            put("IR", "Asia/Tehran")
+            put("IS", "Atlantic/Reykjavik")
+            put("IT", "Europe/Rome")
+            put("JE", "Europe/Jersey")
+            put("JM", "Jamaica")
+            put("JO", "Asia/Amman")
+            put("JP", "Asia/Tokyo")
+            put("KE", "Africa/Nairobi")
+            put("KG", "Asia/Bishkek")
+            put("KH", "Asia/Phnom_Penh")
+            put("KI", "Pacific/Tarawa")
+            put("KM", "Indian/Comoro")
+            put("KN", "America/St_Kitts")
+            put("KP", "Asia/Pyongyang")
+            put("KR", "Asia/Seoul")
+            put("KW", "Asia/Riyadh")
+            put("KY", "America/Cayman")
+            put("KZ", "Asia/Oral")
+            put("LA", "Asia/Vientiane")
+            put("LB", "Asia/Beirut")
+            put("LC", "America/St_Lucia")
+            put("LI", "Europe/Vaduz")
+            put("LK", "Asia/Colombo")
+            put("LR", "Africa/Monrovia")
+            put("LS", "Africa/Maseru")
+            put("LT", "Europe/Vilnius")
+            put("LU", "Europe/Luxembourg")
+            put("LV", "Europe/Riga")
+            put("LY", "Africa/Tripoli")
+            put("MA", "Africa/Casablanca")
+            put("MC", "Europe/Monaco")
+            put("MD", "Europe/Chisinau")
+            put("MDT", "America/Denver")
+            put("ME", "Europe/Podgorica")
+            put("MF", "America/Marigot")
+            put("MG", "Indian/Antananarivo")
+            put("MH", "Pacific/Majuro")
+            put("MK", "Europe/Skopje")
+            put("ML", "Africa/Timbuktu")
+            put("MM", "Asia/Yangon")
+            put("MN", "Asia/Ulaanbaatar")
+            put("MO", "Asia/Macau")
+            put("MP", "Pacific/Saipan")
+            put("MQ", "America/Martinique")
+            put("MR", "Africa/Nouakchott")
+            put("MS", "America/Montserrat")
+            put("MST", "America/Denver")
+            put("MT", "Europe/Malta")
+            put("MU", "Indian/Mauritius")
+            put("MV", "Indian/Maldives")
+            put("MW", "Africa/Blantyre")
+            put("MX", "America/Mexico_City")
+            put("MY", "Asia/Kuala_Lumpur")
+            put("MZ", "Africa/Maputo")
+            put("NA", "Africa/Windhoek")
+            put("NC", "Pacific/Noumea")
+            put("NE", "Africa/Niamey")
+            put("NF", "Pacific/Norfolk")
+            put("NG", "Africa/Lagos")
+            put("NI", "America/Managua")
+            put("NL", "Europe/Amsterdam")
+            put("NO", "Europe/Oslo")
+            put("NP", "Asia/Kathmandu")
+            put("NR", "Pacific/Nauru")
+            put("NU", "Pacific/Niue")
+            put("NZ", "Pacific/Auckland")
+            put("OM", "Asia/Muscat")
+            put("PA", "America/Panama")
+            put("PDT", "America/Los_Angeles")
+            put("PE", "America/Lima")
+            put("PF", "Pacific/Tahiti")
+            put("PG", "Pacific/Port_Moresby")
+            put("PH", "Asia/Manila")
+            put("PK", "Asia/Karachi")
+            put("PL", "Europe/Warsaw")
+            put("PM", "America/Miquelon")
+            put("PN", "Pacific/Pitcairn")
+            put("PR", "America/Puerto_Rico")
+            put("PS", "Asia/Gaza")
+            put("PST", "America/Los_Angeles")
+            put("PT", "Europe/Lisbon")
+            put("PW", "Pacific/Palau")
+            put("PY", "America/Asuncion")
+            put("QA", "Asia/Qatar")
+            put("RE", "Indian/Reunion")
+            put("RO", "Europe/Bucharest")
+            put("RS", "Europe/Belgrade")
+            put("RU", "Europe/Moscow")
+            put("RW", "Africa/Kigali")
+            put("SA", "Asia/Riyadh")
+            put("SB", "Pacific/Guadalcanal")
+            put("SC", "Indian/Mahe")
+            put("SD", "Africa/Khartoum")
+            put("SE", "Europe/Stockholm")
+            put("SG", "Asia/Singapore")
+            put("SH", "Atlantic/St_Helena")
+            put("SI", "Europe/Ljubljana")
+            put("SJ", "Atlantic/Jan_Mayen")
+            put("SK", "Europe/Bratislava")
+            put("SL", "Africa/Freetown")
+            put("SM", "Europe/San_Marino")
+            put("SN", "Africa/Dakar")
+            put("SO", "Africa/Mogadishu")
+            put("SR", "America/Paramaribo")
+            put("SS", "Africa/Juba")
+            put("ST", "Africa/Sao_Tome")
+            put("SV", "America/El_Salvador")
+            put("SX", "America/Lower_Princes")
+            put("SY", "Asia/Damascus")
+            put("SZ", "Africa/Mbabane")
+            put("TC", "America/Grand_Turk")
+            put("TD", "Africa/Ndjamena")
+            put("TF", "Indian/Kerguelen")
+            put("TG", "Africa/Lome")
+            put("TH", "Asia/Bangkok")
+            put("TJ", "Asia/Dushanbe")
+            put("TK", "Pacific/Fakaofo")
+            put("TL", "Asia/Dili")
+            put("TM", "Asia/Ashgabat")
+            put("TN", "Africa/Tunis")
+            put("TO", "Pacific/Tongatapu")
+            put("TR", "Europe/Istanbul")
+            put("TT", "America/Port_of_Spain")
+            put("TV", "Pacific/Funafuti")
+            put("TW", "Asia/Taipei")
+            put("TZ", "Africa/Dar_es_Salaam")
+            put("UA", "Europe/Kiev")
+            put("UG", "Africa/Kampala")
+            put("UK", "Europe/London")
+            put("UM", "Pacific/Wake")
+            put("US", "America/New_York")
+            put("UTC", "UTC")
+            put("UY", "America/Montevideo")
+            put("UZ", "Asia/Tashkent")
+            put("VA", "Europe/Vatican")
+            put("VC", "America/St_Vincent")
+            put("VE", "America/Caracas")
+            put("VG", "America/Tortola")
+            put("VI", "America/St_Thomas")
+            put("VN", "Asia/Ho_Chi_Minh")
+            put("VU", "Pacific/Efate")
+            put("WF", "Pacific/Wallis")
+            put("WS", "Pacific/Apia")
+            put("YE", "Asia/Aden")
+            put("YT", "Indian/Mayotte")
+            put("ZA", "Africa/Johannesburg")
+            put("ZM", "Africa/Lusaka")
+            put("ZULU", "Zulu")
+            put("ZW", "Africa/Harare")
+            ZoneId.getAvailableZoneIds().filter { it.length <= 3 && !containsKey(it) }
+                .forEach { tz -> put(tz, tz) }
+        }
 
         // The Time command
         private const val TIME_CMD = "time"
@@ -93,279 +360,6 @@ class WorldTime : AbstractModule() {
                 "Unsupported country/zone. Please try again."
             }
         }
-
-        init {
-            // Initialize the zones map
-            val zones = mutableMapOf<String, String>()
-            zones["AD"] = "Europe/Andorra"
-            zones["AE"] = "Asia/Dubai"
-            zones["AF"] = "Asia/Kabul"
-            zones["AG"] = "America/Antigua"
-            zones["AI"] = "America/Anguilla"
-            zones["AKDT"] = "America/Anchorage"
-            zones["AKST"] = "America/Anchorage"
-            zones["AL"] = "Europe/Tirane"
-            zones["AM"] = "Asia/Yerevan"
-            zones["AO"] = "Africa/Luanda"
-            zones["AQ"] = "Antarctica/South_Pole"
-            zones["AR"] = "America/Argentina/Buenos_Aires"
-            zones["AS"] = "Pacific/Pago_Pago"
-            zones["AT"] = "Europe/Vienna"
-            zones["AU"] = "Australia/Sydney"
-            zones["AW"] = "America/Aruba"
-            zones["AX"] = "Europe/Mariehamn"
-            zones["AZ"] = "Asia/Baku"
-            zones["BA"] = "Europe/Sarajevo"
-            zones["BB"] = "America/Barbados"
-            zones["BD"] = "Asia/Dhaka"
-            zones["BE"] = "Europe/Brussels"
-            zones["BEAT"] = BEATS_KEYWORD
-            zones["BF"] = "Africa/Ouagadougou"
-            zones["BG"] = "Europe/Sofia"
-            zones["BH"] = "Asia/Bahrain"
-            zones["BI"] = "Africa/Bujumbura"
-            zones["BJ"] = "Africa/Porto-Novo"
-            zones["BL"] = "America/St_Barthelemy"
-            zones["BM"] = "Atlantic/Bermuda"
-            zones["BMT"] = BEATS_KEYWORD
-            zones["BN"] = "Asia/Brunei"
-            zones["BO"] = "America/La_Paz"
-            zones["BQ"] = "America/Kralendijk"
-            zones["BR"] = "America/Sao_Paulo"
-            zones["BS"] = "America/Nassau"
-            zones["BT"] = "Asia/Thimphu"
-            zones["BW"] = "Africa/Gaborone"
-            zones["BY"] = "Europe/Minsk"
-            zones["BZ"] = "America/Belize"
-            zones["CA"] = "America/Montreal"
-            zones["CC"] = "Indian/Cocos"
-            zones["CD"] = "Africa/Kinshasa"
-            zones["CDT"] = "America/Chicago"
-            zones["CET"] = "CET"
-            zones["CF"] = "Africa/Bangui"
-            zones["CG"] = "Africa/Brazzaville"
-            zones["CH"] = "Europe/Zurich"
-            zones["CI"] = "Africa/Abidjan"
-            zones["CK"] = "Pacific/Rarotonga"
-            zones["CL"] = "America/Santiago"
-            zones["CM"] = "Africa/Douala"
-            zones["CN"] = "Asia/Shanghai"
-            zones["CO"] = "America/Bogota"
-            zones["CR"] = "America/Costa_Rica"
-            zones["CST"] = "America/Chicago"
-            zones["CU"] = "Cuba"
-            zones["CV"] = "Atlantic/Cape_Verde"
-            zones["CW"] = "America/Curacao"
-            zones["CX"] = "Indian/Christmas"
-            zones["CY"] = "Asia/Nicosia"
-            zones["CZ"] = "Europe/Prague"
-            zones["DE"] = "Europe/Berlin"
-            zones["DJ"] = "Africa/Djibouti"
-            zones["DK"] = "Europe/Copenhagen"
-            zones["DM"] = "America/Dominica"
-            zones["DO"] = "America/Santo_Domingo"
-            zones["DZ"] = "Africa/Algiers"
-            zones["EC"] = "Pacific/Galapagos"
-            zones["EDT"] = "America/New_York"
-            zones["EE"] = "Europe/Tallinn"
-            zones["EG"] = "Africa/Cairo"
-            zones["EH"] = "Africa/El_Aaiun"
-            zones["ER"] = "Africa/Asmara"
-            zones["ES"] = "Europe/Madrid"
-            zones["EST"] = "America/New_York"
-            zones["ET"] = "Africa/Addis_Ababa"
-            zones["FI"] = "Europe/Helsinki"
-            zones["FJ"] = "Pacific/Fiji"
-            zones["FK"] = "Atlantic/Stanley"
-            zones["FM"] = "Pacific/Yap"
-            zones["FO"] = "Atlantic/Faroe"
-            zones["FR"] = "Europe/Paris"
-            zones["GA"] = "Africa/Libreville"
-            zones["GB"] = "Europe/London"
-            zones["GD"] = "America/Grenada"
-            zones["GE"] = "Asia/Tbilisi"
-            zones["GF"] = "America/Cayenne"
-            zones["GG"] = "Europe/Guernsey"
-            zones["GH"] = "Africa/Accra"
-            zones["GI"] = "Europe/Gibraltar"
-            zones["GL"] = "America/Thule"
-            zones["GM"] = "Africa/Banjul"
-            zones["GMT"] = "GMT"
-            zones["GN"] = "Africa/Conakry"
-            zones["GP"] = "America/Guadeloupe"
-            zones["GQ"] = "Africa/Malabo"
-            zones["GR"] = "Europe/Athens"
-            zones["GS"] = "Atlantic/South_Georgia"
-            zones["GT"] = "America/Guatemala"
-            zones["GU"] = "Pacific/Guam"
-            zones["GW"] = "Africa/Bissau"
-            zones["GY"] = "America/Guyana"
-            zones["HK"] = "Asia/Hong_Kong"
-            zones["HN"] = "America/Tegucigalpa"
-            zones["HR"] = "Europe/Zagreb"
-            zones["HST"] = "Pacific/Honolulu"
-            zones["HT"] = "America/Port-au-Prince"
-            zones["HU"] = "Europe/Budapest"
-            zones["ID"] = "Asia/Jakarta"
-            zones["IE"] = "Europe/Dublin"
-            zones["IL"] = "Asia/Tel_Aviv"
-            zones["IM"] = "Europe/Isle_of_Man"
-            zones["IN"] = "Asia/Kolkata"
-            zones["IO"] = "Indian/Chagos"
-            zones["IQ"] = "Asia/Baghdad"
-            zones["IR"] = "Asia/Tehran"
-            zones["IS"] = "Atlantic/Reykjavik"
-            zones["IT"] = "Europe/Rome"
-            zones["JE"] = "Europe/Jersey"
-            zones["JM"] = "Jamaica"
-            zones["JO"] = "Asia/Amman"
-            zones["JP"] = "Asia/Tokyo"
-            zones["KE"] = "Africa/Nairobi"
-            zones["KG"] = "Asia/Bishkek"
-            zones["KH"] = "Asia/Phnom_Penh"
-            zones["KI"] = "Pacific/Tarawa"
-            zones["KM"] = "Indian/Comoro"
-            zones["KN"] = "America/St_Kitts"
-            zones["KP"] = "Asia/Pyongyang"
-            zones["KR"] = "Asia/Seoul"
-            zones["KW"] = "Asia/Riyadh"
-            zones["KY"] = "America/Cayman"
-            zones["KZ"] = "Asia/Oral"
-            zones["LA"] = "Asia/Vientiane"
-            zones["LB"] = "Asia/Beirut"
-            zones["LC"] = "America/St_Lucia"
-            zones["LI"] = "Europe/Vaduz"
-            zones["LK"] = "Asia/Colombo"
-            zones["LR"] = "Africa/Monrovia"
-            zones["LS"] = "Africa/Maseru"
-            zones["LT"] = "Europe/Vilnius"
-            zones["LU"] = "Europe/Luxembourg"
-            zones["LV"] = "Europe/Riga"
-            zones["LY"] = "Africa/Tripoli"
-            zones["MA"] = "Africa/Casablanca"
-            zones["MC"] = "Europe/Monaco"
-            zones["MD"] = "Europe/Chisinau"
-            zones["MDT"] = "America/Denver"
-            zones["ME"] = "Europe/Podgorica"
-            zones["MF"] = "America/Marigot"
-            zones["MG"] = "Indian/Antananarivo"
-            zones["MH"] = "Pacific/Majuro"
-            zones["MK"] = "Europe/Skopje"
-            zones["ML"] = "Africa/Timbuktu"
-            zones["MM"] = "Asia/Yangon"
-            zones["MN"] = "Asia/Ulaanbaatar"
-            zones["MO"] = "Asia/Macau"
-            zones["MP"] = "Pacific/Saipan"
-            zones["MQ"] = "America/Martinique"
-            zones["MR"] = "Africa/Nouakchott"
-            zones["MS"] = "America/Montserrat"
-            zones["MST"] = "America/Denver"
-            zones["MT"] = "Europe/Malta"
-            zones["MU"] = "Indian/Mauritius"
-            zones["MV"] = "Indian/Maldives"
-            zones["MW"] = "Africa/Blantyre"
-            zones["MX"] = "America/Mexico_City"
-            zones["MY"] = "Asia/Kuala_Lumpur"
-            zones["MZ"] = "Africa/Maputo"
-            zones["NA"] = "Africa/Windhoek"
-            zones["NC"] = "Pacific/Noumea"
-            zones["NE"] = "Africa/Niamey"
-            zones["NF"] = "Pacific/Norfolk"
-            zones["NG"] = "Africa/Lagos"
-            zones["NI"] = "America/Managua"
-            zones["NL"] = "Europe/Amsterdam"
-            zones["NO"] = "Europe/Oslo"
-            zones["NP"] = "Asia/Kathmandu"
-            zones["NR"] = "Pacific/Nauru"
-            zones["NU"] = "Pacific/Niue"
-            zones["NZ"] = "Pacific/Auckland"
-            zones["OM"] = "Asia/Muscat"
-            zones["PA"] = "America/Panama"
-            zones["PDT"] = "America/Los_Angeles"
-            zones["PE"] = "America/Lima"
-            zones["PF"] = "Pacific/Tahiti"
-            zones["PG"] = "Pacific/Port_Moresby"
-            zones["PH"] = "Asia/Manila"
-            zones["PK"] = "Asia/Karachi"
-            zones["PL"] = "Europe/Warsaw"
-            zones["PM"] = "America/Miquelon"
-            zones["PN"] = "Pacific/Pitcairn"
-            zones["PR"] = "America/Puerto_Rico"
-            zones["PS"] = "Asia/Gaza"
-            zones["PST"] = "America/Los_Angeles"
-            zones["PT"] = "Europe/Lisbon"
-            zones["PW"] = "Pacific/Palau"
-            zones["PY"] = "America/Asuncion"
-            zones["QA"] = "Asia/Qatar"
-            zones["RE"] = "Indian/Reunion"
-            zones["RO"] = "Europe/Bucharest"
-            zones["RS"] = "Europe/Belgrade"
-            zones["RU"] = "Europe/Moscow"
-            zones["RW"] = "Africa/Kigali"
-            zones["SA"] = "Asia/Riyadh"
-            zones["SB"] = "Pacific/Guadalcanal"
-            zones["SC"] = "Indian/Mahe"
-            zones["SD"] = "Africa/Khartoum"
-            zones["SE"] = "Europe/Stockholm"
-            zones["SG"] = "Asia/Singapore"
-            zones["SH"] = "Atlantic/St_Helena"
-            zones["SI"] = "Europe/Ljubljana"
-            zones["SJ"] = "Atlantic/Jan_Mayen"
-            zones["SK"] = "Europe/Bratislava"
-            zones["SL"] = "Africa/Freetown"
-            zones["SM"] = "Europe/San_Marino"
-            zones["SN"] = "Africa/Dakar"
-            zones["SO"] = "Africa/Mogadishu"
-            zones["SR"] = "America/Paramaribo"
-            zones["SS"] = "Africa/Juba"
-            zones["ST"] = "Africa/Sao_Tome"
-            zones["SV"] = "America/El_Salvador"
-            zones["SX"] = "America/Lower_Princes"
-            zones["SY"] = "Asia/Damascus"
-            zones["SZ"] = "Africa/Mbabane"
-            zones["TC"] = "America/Grand_Turk"
-            zones["TD"] = "Africa/Ndjamena"
-            zones["TF"] = "Indian/Kerguelen"
-            zones["TG"] = "Africa/Lome"
-            zones["TH"] = "Asia/Bangkok"
-            zones["TJ"] = "Asia/Dushanbe"
-            zones["TK"] = "Pacific/Fakaofo"
-            zones["TL"] = "Asia/Dili"
-            zones["TM"] = "Asia/Ashgabat"
-            zones["TN"] = "Africa/Tunis"
-            zones["TO"] = "Pacific/Tongatapu"
-            zones["TR"] = "Europe/Istanbul"
-            zones["TT"] = "America/Port_of_Spain"
-            zones["TV"] = "Pacific/Funafuti"
-            zones["TW"] = "Asia/Taipei"
-            zones["TZ"] = "Africa/Dar_es_Salaam"
-            zones["UA"] = "Europe/Kiev"
-            zones["UG"] = "Africa/Kampala"
-            zones["UK"] = "Europe/London"
-            zones["UM"] = "Pacific/Wake"
-            zones["US"] = "America/New_York"
-            zones["UTC"] = "UTC"
-            zones["UY"] = "America/Montevideo"
-            zones["UZ"] = "Asia/Tashkent"
-            zones["VA"] = "Europe/Vatican"
-            zones["VC"] = "America/St_Vincent"
-            zones["VE"] = "America/Caracas"
-            zones["VG"] = "America/Tortola"
-            zones["VI"] = "America/St_Thomas"
-            zones["VN"] = "Asia/Ho_Chi_Minh"
-            zones["VU"] = "Pacific/Efate"
-            zones["WF"] = "Pacific/Wallis"
-            zones["WS"] = "Pacific/Apia"
-            zones["YE"] = "Asia/Aden"
-            zones["YT"] = "Indian/Mayotte"
-            zones["ZA"] = "Africa/Johannesburg"
-            zones["ZM"] = "Africa/Lusaka"
-            zones["ZULU"] = "Zulu"
-            zones["ZW"] = "Africa/Harare"
-            ZoneId.getAvailableZoneIds().filter { it.length <= 3 && !zones.containsKey(it) }
-                .forEach { tz -> zones[tz] = tz }
-            COUNTRIES_MAP = Collections.unmodifiableMap(zones)
-        }
     }
 
     override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {

From 65e221a4f6039b48e7ef17738ed12d2247855040 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 28 Nov 2021 23:27:09 -0800
Subject: [PATCH 243/262] Improved IP address regex.

---
 src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt   | 5 ++---
 .../kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt    | 5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
index 703f138..83caf6e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -54,9 +54,8 @@ class Lookup : AbstractModule() {
                 event.respondWith(nslookup(args).prependIndent())
             } catch (ignore: UnknownHostException) {
                 if (args.matches(
-                        ("(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
-                                "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." +
-                                "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)").toRegex()
+                        ("(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)")
+                            .toRegex()
                     )
                 ) {
                     try {
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
index b3e3dff..b0fdfcd 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -45,8 +45,11 @@ class LookupTest {
     @Test
     @Throws(Exception::class)
     fun testLookup() {
-        val result = nslookup("apple.com")
+        var result = nslookup("apple.com")
         assertThat(result, "lookup(apple.com)").contains("17.253.144.10")
+
+        result = nslookup("204.122.17.9")
+        assertThat(result, "lookup(204.122.17.9)").contains("nix3.thauvin.us")
     }
 
     @Test

From 54e6e6dd87075b76e44f38be7054c03218c8c9e1 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 28 Nov 2021 23:27:32 -0800
Subject: [PATCH 244/262] Cleaned up.

---
 src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt   | 4 ++--
 src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
index bc527f0..716d829 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
@@ -60,8 +60,8 @@ class Addons {
 
             if (isEnabled) {
                 modules.add(this)
-                modulesNames.add(this.javaClass.simpleName)
-                names.addAll(this.commands)
+                modulesNames.add(javaClass.simpleName)
+                names.addAll(commands)
             }
         }
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt
index 8083c74..16bd365 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt
@@ -110,7 +110,7 @@ class Pinboard {
      */
     private fun Date.toTimestamp(): String {
         return ZonedDateTime.ofInstant(
-            this.toInstant().truncatedTo(ChronoUnit.SECONDS),
+            toInstant().truncatedTo(ChronoUnit.SECONDS),
             ZoneId.systemDefault()
         ).format(DateTimeFormatter.ISO_INSTANT)
     }
@@ -119,7 +119,7 @@ class Pinboard {
      * Returns the pinboard.in extended attribution line.
      */
     private fun EntryLink.postedBy(ircServer: String): String {
-        return "Posted by ${this.nick} on ${this.channel} ( $ircServer )"
+        return "Posted by $nick on $channel ( $ircServer )"
     }
 }
 

From db1a1a9474ca711f1d6b67327b702626e03f4b2a Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 28 Nov 2021 23:30:58 -0800
Subject: [PATCH 245/262] Removed jacoco. Added isNonStable function for
 versions plugin.

---
 build.gradle | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3d1220c..779afda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,8 +2,7 @@ plugins {
     id 'application'
     id 'com.github.ben-manes.versions' version '0.39.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.19.0-RC1'
-    id 'jacoco'
+    id 'io.gitlab.arturbosch.detekt' version '1.19.0-RC2'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
     id 'org.jetbrains.kotlin.jvm' version '1.6.0'
@@ -19,11 +18,17 @@ final def packageName = 'net.thauvin.erik.mobibot'
 final def deployDir = 'deploy'
 final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 
+def isNonStable = { String version ->
+  def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) }
+  def regex = /^[0-9,.v-]+(-r)?$/
+  return !stableKeyword && !(version ==~ regex)
+}
+
 mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
         log4j: '2.14.1',
-        pmd  : '6.40.0',
+        pmd  : '6.41.0',
 ]
 
 repositories {
@@ -46,7 +51,7 @@ dependencies {
     implementation 'com.google.guava:guava:31.0.1-jre'
 
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-RC'
 
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
@@ -56,7 +61,7 @@ dependencies {
     implementation 'commons-net:commons-net:3.8.0'
 
     implementation 'com.rometools:rome:1.16.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
 
     implementation 'net.aksingh:owm-japis:2.5.3.0'
     implementation 'com.google.code.gson:gson:2.8.9'
@@ -113,6 +118,12 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     }
 }
 
+tasks.named("dependencyUpdates").configure {
+  rejectVersionIf {
+    isNonStable(it.candidate.version)
+  }
+}
+
 pmd {
     toolVersion = versions.pmd
     ignoreFailures = true
@@ -162,18 +173,6 @@ sonarqube {
     }
 }
 
-jacoco {
-    toolVersion = '0.8.7'
-}
-
-jacocoTestReport {
-    dependsOn test
-    reports {
-        html.required = true
-        xml.required = true
-    }
-}
-
 tasks.sonarqube {
     dependsOn 'koverReport'
 }

From db6f322ce5987e2411ba88c632b7982499acb49c Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 28 Nov 2021 23:32:23 -0800
Subject: [PATCH 246/262] Baseline update.

---
 config/detekt/baseline.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 3bcc3cb..0188ff5 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -9,6 +9,7 @@
     <ID>LongMethod:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongParameterList:Comment.kt$Comment$( channel: String, cmd: String, entry: EntryLink, entryIndex: Int, commentIndex: Int, event: GenericMessageEvent )</ID>
+    <ID>LongParameterList:EntryLink.kt$EntryLink$( // Link's comments val comments: MutableList&lt;EntryComment&gt; = mutableListOf(), // Tags/categories val tags: MutableList&lt;SyndCategory&gt; = mutableListOf(), // Channel var channel: String, // Creation date var date: Date = Calendar.getInstance().time, // Link's URL var link: String, // Author's login var login: String = "", // Author's nickname var nick: String, // Link's title var title: String )</ID>
     <ID>LongParameterList:Twitter.kt$Twitter.Companion$( consumerKey: String?, consumerSecret: String?, token: String?, tokenSecret: String?, handle: String?, message: String, isDm: Boolean )</ID>
     <ID>MagicNumber:Comment.kt$Comment$3</ID>
     <ID>MagicNumber:CurrencyConverter.kt$CurrencyConverter$11</ID>
@@ -21,7 +22,6 @@
     <ID>MagicNumber:Ignore.kt$Ignore$8</ID>
     <ID>MagicNumber:Mobibot.kt$Mobibot$8</ID>
     <ID>MagicNumber:Modules.kt$Modules$7</ID>
-    <ID>MagicNumber:Recap.kt$Recap.Companion$10</ID>
     <ID>MagicNumber:StockQuote.kt$StockQuote.Companion$10</ID>
     <ID>MagicNumber:Tell.kt$Tell$50</ID>
     <ID>MagicNumber:Tell.kt$Tell$7</ID>
@@ -32,7 +32,6 @@
     <ID>MagicNumber:Utils.kt$Utils$30</ID>
     <ID>MagicNumber:Utils.kt$Utils$365</ID>
     <ID>MagicNumber:Utils.kt$Utils$7</ID>
-    <ID>MagicNumber:View.kt$View$6</ID>
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$1.60934</ID>
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$32</ID>
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$404</ID>
@@ -40,7 +39,6 @@
     <ID>MagicNumber:Weather2.kt$Weather2.Companion$9</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime$14</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime$4</ID>
-    <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3600</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$60</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$86.4</ID>
@@ -56,7 +54,6 @@
     <ID>NestedBlockDepth:Posting.kt$Posting$override fun commandResponse(channel: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:Tell.kt$Tell$ fun send(event: GenericUserEvent)</ID>
-    <ID>NestedBlockDepth:Tell.kt$Tell$// Delete message. private fun deleteMessage(channel: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ fun load(file: String): List&lt;TellMessage&gt;</ID>
     <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ fun save(file: String, messages: List&lt;TellMessage?&gt;?)</ID>
     <ID>NestedBlockDepth:TwitterOAuth.kt$TwitterOAuth$ @Throws(TwitterException::class, IOException::class) @JvmStatic fun main(args: Array&lt;String&gt;)</ID>

From fd39c25c7d1702504e2cb6b05c64873f45d83923 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 5 Dec 2021 22:53:29 -0800
Subject: [PATCH 247/262] Cleanup.

---
 .idea/runConfigurations.xml                   | 10 ----------
 .../net/thauvin/erik/mobibot/Mobibot.kt       |  2 +-
 .../net/thauvin/erik/mobibot/TwitterOAuth.kt  |  2 +-
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  |  3 ++-
 .../erik/mobibot/commands/links/LinksMgr.kt   | 19 +++++++++++++++----
 .../erik/mobibot/commands/tell/Tell.kt        |  1 -
 .../mobibot/commands/tell/TellMessagesMgr.kt  |  6 +++++-
 .../erik/mobibot/entries/EntriesUtils.kt      |  4 ++++
 .../thauvin/erik/mobibot/entries/FeedsMgr.kt  |  2 ++
 .../erik/mobibot/modules/CryptoPrices.kt      |  1 +
 .../net/thauvin/erik/mobibot/modules/Dice.kt  |  1 +
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  8 ++++++--
 .../net/thauvin/erik/mobibot/msg/Message.kt   |  1 -
 13 files changed, 38 insertions(+), 22 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index bee3340..62e0fca 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -242,8 +242,8 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
     }
 
     companion object {
-        @Throws(Exception::class)
         @JvmStatic
+        @Throws(Exception::class)
         fun main(args: Array<String>) {
             // Set up the command line options
             val options = Options()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
index a96b491..345943b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
@@ -59,8 +59,8 @@ object TwitterOAuth {
      *
      * @param args The consumerKey and consumerSecret should be passed as arguments.
      */
-    @Throws(TwitterException::class, IOException::class)
     @JvmStatic
+    @Throws(TwitterException::class, IOException::class)
     fun main(args: Array<String>) {
         if (args.size == 2) {
             with(TwitterFactory.getSingleton()) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 835125d..f489194 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -182,7 +182,8 @@ object Utils {
     /**
      * Return the last item of a list of strings or empty if none.
      */
-    fun List<String>.lastOrEmpty() : String {
+    @JvmStatic
+    fun List<String>.lastOrEmpty(): String {
         return if (this.size >= 2) {
             this.last()
         } else
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index 17b06e1..07abbf5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -70,16 +70,27 @@ class LinksMgr : AbstractCommand() {
         const val TAGS_PROP = "tags"
         const val TAG_MATCH = ", *| +"
 
-        /** Entries array **/
+        /**
+         * Entries array
+         */
+        @JvmField
         val entries = Entries()
 
-        /** Pinboard handler. **/
+        /**
+         * Pinboard handler.
+         */
+        @JvmField
         val pinboard = Pinboard()
 
-        /** Twitter handler. **/
+        /**
+         * Twitter handler.
+         */
+        @JvmField
         val twitter = Twitter()
 
-        /** Let the user know if the entries are too old to be modified. **/
+        /**
+         * Let the user know if the entries are too old to be modified.
+         */
         @JvmStatic
         fun isUpToDate(event: GenericMessageEvent): Boolean {
             if (entries.lastPubDate != today()) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index b18327f..c3a0b65 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -81,7 +81,6 @@ class Tell(private val serialObject: String) : AbstractCommand() {
      * Cleans the messages queue.
      */
     private fun clean(): Boolean {
-        // if (bot.logger.isDebugEnabled) bot.logger.debug("Cleaning the messages.")
         return TellMessagesMgr.clean(messages, maxDays.toLong())
     }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
index 5960b63..e61b814 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -48,12 +48,14 @@ import kotlin.io.path.exists
  * The Tell Messages Manager.
  */
 object TellMessagesMgr {
-    val logger: Logger = LoggerFactory.getLogger(TellMessagesMgr::class.java)
+    private val logger: Logger = LoggerFactory.getLogger(TellMessagesMgr::class.java)
 
     /**
      * Cleans the messages queue.
      */
+    @JvmStatic
     fun clean(tellMessages: MutableList<TellMessage>, tellMaxDays: Long): Boolean {
+        if (logger.isDebugEnabled) logger.debug("Cleaning the messages.")
         val today = LocalDateTime.now(Clock.systemUTC())
         return tellMessages.removeIf { o: TellMessage -> o.queued.plusDays(tellMaxDays).isBefore(today) }
     }
@@ -61,6 +63,7 @@ object TellMessagesMgr {
     /**
      * Loads the messages.
      */
+    @JvmStatic
     fun load(file: String): List<TellMessage> {
         val serialFile = Paths.get(file)
         if (serialFile.exists()) {
@@ -84,6 +87,7 @@ object TellMessagesMgr {
     /**
      * Saves the messages.
      */
+    @JvmStatic
     fun save(file: String, messages: List<TellMessage?>?) {
         try {
             BufferedOutputStream(Files.newOutputStream(Paths.get(file))).use { bos ->
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index 4c4c29c..02cfd4d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -42,17 +42,20 @@ object EntriesUtils {
     /**
      * Build link label based on its index. e.g: L1
      */
+    @JvmStatic
     fun buildLinkLabel(index: Int): String = Constants.LINK_CMD + (index + 1)
 
     /**
      * Builds an entry's comment for display on the channel.
      */
+    @JvmStatic
     fun buildComment(entryIndex: Int, commentIndex: Int, comment: EntryComment): String =
         ("${buildLinkLabel(entryIndex)}.${commentIndex + 1}: [${comment.nick}] ${comment.comment}")
 
     /**
      * Builds an entry's link for display on the channel.
      */
+    @JvmStatic
     @JvmOverloads
     fun buildLink(entryIndex: Int, entry: EntryLink, isView: Boolean = false): String {
         val buff = StringBuilder().append(buildLinkLabel(entryIndex)).append(": ")
@@ -75,6 +78,7 @@ object EntriesUtils {
     /**
      * Build an entry's tags/categories for display on the channel.
      */
+    @JvmStatic
     fun buildTags(entryIndex: Int, entry: EntryLink): String =
         buildLinkLabel(entryIndex) + "${Constants.TAG_CMD}: " + entry.pinboardTags.replace(",", ", ")
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt
index ccbcd46..5891720 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt
@@ -68,6 +68,7 @@ class FeedsMgr private constructor() {
         /**
          * Loads the current feed.
          */
+        @JvmStatic
         @Throws(IOException::class, FeedException::class)
         fun loadFeed(entries: Entries, currentFile: String = currentXml): String {
             entries.links.clear()
@@ -113,6 +114,7 @@ class FeedsMgr private constructor() {
         /**
          * Saves the feeds.
          */
+        @JvmStatic
         fun saveFeed(entries: Entries, currentFile: String = currentXml) {
             if (logger.isDebugEnabled) logger.debug("Saving the feeds...")
             if (entries.logsDir.isNotBlank()) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index 9721055..35b0b86 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -83,6 +83,7 @@ class CryptoPrices : ThreadedModule() {
         /**
          * Get current market price.
          */
+        @JvmStatic
         fun currentPrice(args: List<String>): CryptoPrice {
             return if (args.size == 2)
                 spotPrice(args[0], args[1])
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 4dced28..848df2c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -76,6 +76,7 @@ class Dice : AbstractModule() {
         // Dice faces
         private val DICE_FACES = arrayOf("", "⚀", "⚁", "⚂", "⚃", "⚄", "⚅")
 
+        @JvmStatic
         fun winLoseOrTie(bot: Int, player: Int): Result {
             return when {
                 bot > player -> {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 7abe820..b5c80eb 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -46,10 +46,14 @@ import java.time.temporal.ChronoField
  */
 class WorldTime : AbstractModule() {
     companion object {
-        // Beats (Internet Time) keyword
+        /**
+         * Beats (Internet Time) keyword
+         */
         const val BEATS_KEYWORD = ".beats"
 
-        // Supported countries
+        /**
+         * Supported countries
+         */
         val COUNTRIES_MAP = buildMap<String, String> {
             put("AG", "America/Antigua")
             put("AI", "America/Anguilla")
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
index 471c310..1d2e5bc 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
@@ -45,7 +45,6 @@ open class Message @JvmOverloads constructor(
 ) {
     companion object {
         var DEFAULT_COLOR = Constants.EMPTY
-
     }
 
     init {

From 562adec17760842174548766b0c23527604b093d Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 5 Dec 2021 22:56:36 -0800
Subject: [PATCH 248/262] Added more tests.

---
 .../net/thauvin/erik/mobibot/AddonsTest.kt    | 86 +++++++++++++++++
 .../erik/mobibot/commands/RecapTest.kt        | 13 ++-
 .../mobibot/commands/tell/TellMessageTest.kt  |  3 -
 .../commands/tell/TellMessagesMgrTest.kt      | 88 ++++++++++++++++++
 .../erik/mobibot/entries/EntriesUtilsTest.kt  | 92 +++++++++++++++++++
 .../erik/mobibot/entries/FeedMgrTest.kt       | 14 +--
 .../thauvin/erik/mobibot/msg/TestMessage.kt   | 10 ++
 7 files changed, 293 insertions(+), 13 deletions(-)
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt
 create mode 100644 src/test/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtilsTest.kt

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
new file mode 100644
index 0000000..b618dc7
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
@@ -0,0 +1,86 @@
+/*
+ * AddonsTest.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot
+
+import assertk.assertThat
+import assertk.assertions.containsExactly
+import assertk.assertions.isEqualTo
+import net.thauvin.erik.mobibot.commands.ChannelFeed
+import net.thauvin.erik.mobibot.commands.Cycle
+import net.thauvin.erik.mobibot.commands.Die
+import net.thauvin.erik.mobibot.commands.Ignore
+import net.thauvin.erik.mobibot.commands.links.Comment
+import net.thauvin.erik.mobibot.commands.links.View
+import net.thauvin.erik.mobibot.modules.Joke
+import net.thauvin.erik.mobibot.modules.RockPaperScissors
+import net.thauvin.erik.mobibot.modules.Twitter
+import org.testng.annotations.Test
+import java.util.*
+
+class AddonsTest {
+    private val addons = Addons()
+
+    @Test
+    fun addTest() {
+        val p = Properties()
+
+        // Modules
+        addons.add(Joke(), p)
+        addons.add(RockPaperScissors(), p)
+        addons.add(Twitter(), p) // no properties, disabled.
+        assertThat(addons.modules.size, "modules = 2").isEqualTo(2)
+
+        assertThat(addons.modulesNames, "module names").containsExactly("Joke", "RockPaperScissors")
+
+        // Commands
+        addons.add(View(), p)
+        addons.add(Comment(), p)
+        addons.add(Cycle(), p)
+        addons.add(Die(), p) // invisible
+        addons.add(ChannelFeed("channel"), p) // no properties, disabled
+        addons.add(Ignore(), p.apply { put(Ignore.IGNORE_PROP, "nick") })
+        assertThat(addons.commands.size, "commands = 4").isEqualTo(5)
+
+        assertThat(addons.ops, "ops").containsExactly("cycle")
+
+        assertThat(addons.names, "names").containsExactly(
+            "joke",
+            "rock",
+            "paper",
+            "scissors",
+            "view",
+            "comment",
+            "ignore"
+        )
+    }
+}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
index d347f1a..2b5ebac 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
@@ -44,11 +44,18 @@ class RecapTest {
     @Test
     fun storeRecapTest() {
         for (i in 1..20) {
-            Recap.storeRecap("sender$i", "test $1", false)
+            Recap.storeRecap("sender$i", "test $i", false)
         }
-        assertThat(Recap.recaps).all {
+        assertThat(Recap.recaps, "recap first and last").all {
             size().isEqualTo(Recap.MAX_RECAPS)
-            prop(MutableList<String>::last).contains("sender20")
+            prop(MutableList<String>::first)
+                .matches("[1-2]\\d{3}-[01]\\d-[0-3]\\d [0-2]\\d:[0-6]\\d - sender11: test 11".toRegex())
+            prop(MutableList<String>::last)
+                .matches("[1-2]\\d{3}-[01]\\d-[0-3]\\d [0-2]\\d:[0-6]\\d - sender20: test 20".toRegex())
         }
+
+        Recap.storeRecap("sender", "test action", true)
+        assertThat(Recap.recaps.last())
+            .matches("[1-2]\\d{3}-[01]\\d-[0-3]\\d [0-2]\\d:[0-6]\\d - sender test action".toRegex())
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index 808ea97..6618f90 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -68,9 +68,6 @@ class TellMessageTest {
         tellMessage.isReceived = false
         assertThat(tellMessage.receptionDate, "reception date not set").isEqualTo(LocalDateTime.MIN)
         tellMessage.isReceived = true
-        assertThat(tellMessage.isReceived, "is received").isTrue()
         assertThat(isValidDate(tellMessage.receptionDate), "received is valid date/time").isTrue()
-        tellMessage.isNotified = true
-        assertThat(tellMessage.isNotified, "is notified").isTrue()
     }
 }
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt
new file mode 100644
index 0000000..97363cd
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt
@@ -0,0 +1,88 @@
+/*
+ * TellMessagesMgrTest.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.commands.tell
+
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.*
+import org.testng.annotations.AfterClass
+import org.testng.annotations.BeforeClass
+import org.testng.annotations.Test
+import java.time.LocalDateTime
+import kotlin.io.path.createTempFile
+import kotlin.io.path.deleteIfExists
+import kotlin.io.path.fileSize
+
+class TellMessagesMgrTest {
+    private val testFile = createTempFile(suffix = ".ser")
+    private val maxDays = 10L
+    private val testMessages = mutableListOf<TellMessage>().apply {
+        for (i in 0..5) {
+            this.add(i, TellMessage("sender$i", "recipient$i", "message $i"))
+        }
+    }
+
+    @BeforeClass
+    fun saveTest() {
+        TellMessagesMgr.save(testFile.toAbsolutePath().toString(), testMessages)
+        assertThat(testFile.fileSize()).isGreaterThan(0)
+    }
+
+    @AfterClass
+    fun afterClass() {
+        testFile.deleteIfExists()
+    }
+
+    @Test
+    fun cleanTest() {
+        testMessages.add(TellMessage("sender", "recipient", "message").apply {
+            queued = LocalDateTime.now().minusDays(maxDays)
+        })
+        val size = testMessages.size
+        assertThat(TellMessagesMgr.clean(testMessages, maxDays + 2), "maxDays = 12").isFalse()
+        assertThat(TellMessagesMgr.clean(testMessages, maxDays), "maxDays = 10").isTrue()
+        assertThat(testMessages.size, "size-- after clean").isEqualTo(size - 1)
+    }
+
+    @Test
+    fun loadTest() {
+        val messages = TellMessagesMgr.load(testFile.toAbsolutePath().toString())
+        for (i in messages.indices) {
+            assertThat(messages[i]).all {
+                prop(TellMessage::sender).isEqualTo(testMessages[i].sender)
+                prop(TellMessage::recipient).isEqualTo(testMessages[i].recipient)
+                prop(TellMessage::message).isEqualTo(testMessages[i].message)
+            }
+        }
+    }
+}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtilsTest.kt
new file mode 100644
index 0000000..ab4ec8e
--- /dev/null
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtilsTest.kt
@@ -0,0 +1,92 @@
+/*
+ * EntriesUtilsTest.kt
+ *
+ * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik.mobibot.entries
+
+import assertk.assertThat
+import assertk.assertions.contains
+import assertk.assertions.isEqualTo
+import net.thauvin.erik.mobibot.Constants
+import net.thauvin.erik.mobibot.entries.EntriesUtils.buildComment
+import net.thauvin.erik.mobibot.entries.EntriesUtils.buildLink
+import net.thauvin.erik.mobibot.entries.EntriesUtils.buildLinkLabel
+import net.thauvin.erik.mobibot.entries.EntriesUtils.buildTags
+import org.testng.annotations.Test
+
+class EntriesUtilsTest {
+    private val comment = EntryComment("comment", "nick")
+    private val links = buildList {
+        for (i in 0..5) {
+            add(
+                EntryLink(
+                    "https://www.mobitopia.org/$i",
+                    "Mobitopia$i",
+                    "Skynx$i",
+                    "JimH$i",
+                    "#mobitopia$i",
+                    listOf("tag1", "tag2", "tag3", "TAG4", "Tag5")
+                )
+            )
+        }
+    }
+
+    @Test
+    fun buildLinkLabelTest() {
+        assertThat(buildLinkLabel(1)).isEqualTo("${Constants.LINK_CMD}2")
+    }
+
+    @Test
+    fun buildCommentTest() {
+        assertThat(buildComment(0, 0, comment)).isEqualTo("${Constants.LINK_CMD}1.1: [nick] comment")
+    }
+
+    @Test
+    fun buildLinkTest() {
+        for (i in links.indices) {
+            assertThat(
+                buildLink(i - 1, links[i]), "link $i"
+            ).isEqualTo("L$i: [Skynx$i] \u0002Mobitopia$i\u0002 ( \u000303https://www.mobitopia.org/$i\u000F )")
+        }
+
+        assertThat(links.first().addComment(comment), "add comment").isEqualTo(0)
+        assertThat(buildLink(0, links.first(), isView = true), "isView = true").contains("[+1]")
+    }
+
+    @Test
+    fun buildTagsTest() {
+        for (i in links.indices) {
+            assertThat(
+                buildTags(i - 1, links[i]), "tag $i"
+            ).isEqualTo("L${i}T: Skynx$i, tag1, tag2, tag3, tag4, tag5")
+        }
+    }
+}
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt
index 04c36a7..271fc4c 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt
@@ -81,13 +81,13 @@ class FeedMgrTest {
         with(entries.links.first()) {
             assertThat(nick, "first nick").isEqualTo("ErikT")
             assertThat(date, "first date").isEqualTo(Date(1635638400000L))
-            comments.forEachIndexed { i, entryComment ->
-                assertThat(entryComment.comment, "comment ${i + 1}").endsWith("comment ${i + 1}.")
-                if (i == 0) {
-                    assertThat(entryComment.nick, "comment ${i + 1} nick").isEqualTo("ErikT")
-                } else {
-                    assertThat(entryComment.nick, "comment ${i + 1} nick").isEqualTo("Skynx")
-                }
+            assertThat(comments.first(), "first comment").all {
+                prop(EntryComment::comment).endsWith("comment 1.")
+                prop(EntryComment::nick).isEqualTo("ErikT")
+            }
+            assertThat(comments.last(), "last comment").all {
+                prop(EntryComment::comment).endsWith("comment 2.")
+                prop(EntryComment::nick).isEqualTo("Skynx")
             }
         }
 
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
index 3d588c5..50f8843 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
@@ -71,6 +71,16 @@ class TestMessage {
         }
     }
 
+    @Test
+    fun testPrivateMessage() {
+        val msg = PrivateMessage("foo")
+        assertThat(msg).all {
+            prop(Message::isPrivate).isTrue()
+            prop(Message::isError).isFalse()
+            prop(Message::isNotice).isFalse()
+        }
+    }
+
     @Test
     fun testPublicMessage() {
         val msg = PublicMessage("foo")

From 0e80f22b4f67c58818eb314940625f7d2793141b Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 5 Dec 2021 22:57:33 -0800
Subject: [PATCH 249/262] Added isEnabled function.

---
 .../erik/mobibot/commands/ChannelFeed.kt        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index 5ac8d7f..9610592 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -36,7 +36,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import net.thauvin.erik.mobibot.FeedReader
 import net.thauvin.erik.mobibot.Utils.helpFormat
-import net.thauvin.erik.mobibot.Utils.sendMessage
 import org.pircbotx.hooks.types.GenericMessageEvent
 
 class ChannelFeed(channel: String) : AbstractCommand() {
@@ -55,16 +54,16 @@ class ChannelFeed(channel: String) : AbstractCommand() {
     }
 
     override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
-        with(properties[FEED_PROP]) {
-            if (!isNullOrBlank()) {
-                runBlocking {
-                    launch {
-                        FeedReader(this@with, event).run()
-                    }
+        if (isEnabled()) {
+            runBlocking {
+                launch {
+                    FeedReader(properties[FEED_PROP]!!, event).run()
                 }
-            } else {
-                event.sendMessage("There is no feed setup for this channel.")
             }
         }
     }
+
+    override fun isEnabled(): Boolean {
+        return !properties[FEED_PROP].isNullOrBlank()
+    }
 }

From 5dd1f89105fdf7d4c296059ec3171e6317b83c32 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 5 Dec 2021 22:57:58 -0800
Subject: [PATCH 250/262] Added AddComment(EntryComment).

---
 .../net/thauvin/erik/mobibot/entries/EntryLink.kt     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
index da8ef87..29f90d7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -94,12 +94,19 @@ class EntryLink(
         this.tags.addAll(tags)
     }
 
+    /**
+     * Adds a new comment
+     */
+    fun addComment(comment: EntryComment): Int {
+        comments.add(comment)
+        return comments.lastIndex
+    }
+
     /**
      * Adds a new comment.
      */
     fun addComment(comment: String, nick: String): Int {
-        comments.add(EntryComment(comment, nick))
-        return comments.lastIndex
+        return addComment(EntryComment(comment, nick))
     }
 
     /**

From db8e1c198c9f6487cdf2924c4c7c783663b261d3 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 5 Dec 2021 22:58:27 -0800
Subject: [PATCH 251/262] Updated dependencies.

---
 .idea/jarRepositories.xml                 | 22 +++-----
 .idea/libraries-with-intellij-classes.xml | 65 -----------------------
 .idea/misc.xml                            |  5 +-
 build.gradle                              |  8 +--
 config/detekt/baseline.xml                | 16 +++---
 gradle/wrapper/gradle-wrapper.properties  |  2 +-
 6 files changed, 20 insertions(+), 98 deletions(-)
 delete mode 100644 .idea/libraries-with-intellij-classes.xml

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 7164ee5..501ee49 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -14,32 +14,22 @@
     <remote-repository>
       <option name="id" value="MavenLocal" />
       <option name="name" value="MavenLocal" />
-      <option name="url" value="file:$MAVEN_REPOSITORY$" />
+      <option name="url" value="file:$MAVEN_REPOSITORY$/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven2" />
+      <option name="name" value="maven2" />
+      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
     </remote-repository>
     <remote-repository>
       <option name="id" value="MavenRepo" />
       <option name="name" value="MavenRepo" />
       <option name="url" value="https://repo.maven.apache.org/maven2/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://oss.sonatype.org/content/repositories/snapshots" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenLocal" />
-      <option name="name" value="MavenLocal" />
-      <option name="url" value="file:$MAVEN_REPOSITORY$/" />
-    </remote-repository>
     <remote-repository>
       <option name="id" value="maven" />
       <option name="name" value="maven" />
       <option name="url" value="https://jitpack.io" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://packages.jetbrains.team/maven/p/ij/intellij-dependencies" />
-    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries-with-intellij-classes.xml b/.idea/libraries-with-intellij-classes.xml
deleted file mode 100644
index 9fa3156..0000000
--- a/.idea/libraries-with-intellij-classes.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="libraries-with-intellij-classes">
-    <option name="intellijApiContainingLibraries">
-      <list>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIU" />
-          <option name="groupId" value="com.jetbrains.intellij.idea" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIU" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIC" />
-          <option name="groupId" value="com.jetbrains.intellij.idea" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="ideaIC" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPY" />
-          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPY" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPC" />
-          <option name="groupId" value="com.jetbrains.intellij.pycharm" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="pycharmPC" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="clion" />
-          <option name="groupId" value="com.jetbrains.intellij.clion" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="clion" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="riderRD" />
-          <option name="groupId" value="com.jetbrains.intellij.rider" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="riderRD" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="goland" />
-          <option name="groupId" value="com.jetbrains.intellij.goland" />
-        </LibraryCoordinatesState>
-        <LibraryCoordinatesState>
-          <option name="artifactId" value="goland" />
-          <option name="groupId" value="com.jetbrains" />
-        </LibraryCoordinatesState>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1503b42..cbfe0de 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <pattern value="net.thauvin.erik.mobibot.modules.War" method="War" />
-  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="15" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 779afda..73b54c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,12 @@ plugins {
     id 'application'
     id 'com.github.ben-manes.versions' version '0.39.0'
     id 'idea'
-    id 'io.gitlab.arturbosch.detekt' version '1.19.0-RC2'
+    id 'io.gitlab.arturbosch.detekt' version '1.19.0'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
     id 'org.jetbrains.kotlin.jvm' version '1.6.0'
     id 'org.jetbrains.kotlin.kapt' version '1.6.0'
-    id 'org.jetbrains.kotlinx.kover' version '0.4.2'
+    id 'org.jetbrains.kotlinx.kover' version '0.4.3'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -19,7 +19,7 @@ final def deployDir = 'deploy'
 final def semverProcessor = "net.thauvin.erik:semver:1.2.0"
 
 def isNonStable = { String version ->
-  def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) }
+  def stableKeyword = ['RELEASE', 'FINAL', 'GA', 'JRE'].any { it -> version.toUpperCase().contains(it) }
   def regex = /^[0-9,.v-]+(-r)?$/
   return !stableKeyword && !(version ==~ regex)
 }
@@ -71,7 +71,7 @@ dependencies {
     implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
     implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
 
-    implementation 'org.json:json:20210307'
+    implementation 'org.json:json:20211205'
     implementation 'org.jsoup:jsoup:1.14.3'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 0188ff5..7f49882 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -2,10 +2,10 @@
 <SmellBaseline>
   <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
-    <ID>ComplexMethod:FeedsMgr.kt$FeedsMgr.Companion$ fun saveFeed(entries: Entries, currentFile: String = currentXml)</ID>
+    <ID>ComplexMethod:FeedsMgr.kt$FeedsMgr.Companion$ @JvmStatic fun saveFeed(entries: Entries, currentFile: String = currentXml)</ID>
     <ID>ComplexMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
-    <ID>LongMethod:FeedsMgr.kt$FeedsMgr.Companion$ fun saveFeed(entries: Entries, currentFile: String = currentXml)</ID>
-    <ID>LongMethod:Mobibot.kt$Mobibot.Companion$@Throws(Exception::class) @JvmStatic fun main(args: Array&lt;String&gt;)</ID>
+    <ID>LongMethod:FeedsMgr.kt$FeedsMgr.Companion$ @JvmStatic fun saveFeed(entries: Entries, currentFile: String = currentXml)</ID>
+    <ID>LongMethod:Mobibot.kt$Mobibot.Companion$@JvmStatic @Throws(Exception::class) fun main(args: Array&lt;String&gt;)</ID>
     <ID>LongMethod:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongMethod:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>LongParameterList:Comment.kt$Comment$( channel: String, cmd: String, entry: EntryLink, entryIndex: Int, commentIndex: Int, event: GenericMessageEvent )</ID>
@@ -46,17 +46,17 @@
     <ID>NestedBlockDepth:Comment.kt$Comment$override fun commandResponse(channel: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
     <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ private fun setTags(tags: List&lt;String?&gt;)</ID>
-    <ID>NestedBlockDepth:FeedsMgr.kt$FeedsMgr.Companion$ @Throws(IOException::class, FeedException::class) fun loadFeed(entries: Entries, currentFile: String = currentXml): String</ID>
-    <ID>NestedBlockDepth:FeedsMgr.kt$FeedsMgr.Companion$ fun saveFeed(entries: Entries, currentFile: String = currentXml)</ID>
+    <ID>NestedBlockDepth:FeedsMgr.kt$FeedsMgr.Companion$ @JvmStatic @Throws(IOException::class, FeedException::class) fun loadFeed(entries: Entries, currentFile: String = currentXml): String</ID>
+    <ID>NestedBlockDepth:FeedsMgr.kt$FeedsMgr.Companion$ @JvmStatic fun saveFeed(entries: Entries, currentFile: String = currentXml)</ID>
     <ID>NestedBlockDepth:GoogleSearch.kt$GoogleSearch.Companion$ @JvmStatic @Throws(ModuleException::class) fun searchGoogle(query: String, apiKey: String?, cseKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:LinksMgr.kt$LinksMgr$override fun commandResponse(channel: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:Lookup.kt$Lookup$override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:Posting.kt$Posting$override fun commandResponse(channel: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:StockQuote.kt$StockQuote.Companion$ @JvmStatic @Throws(ModuleException::class) fun getQuote(symbol: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>NestedBlockDepth:Tell.kt$Tell$ fun send(event: GenericUserEvent)</ID>
-    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ fun load(file: String): List&lt;TellMessage&gt;</ID>
-    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ fun save(file: String, messages: List&lt;TellMessage?&gt;?)</ID>
-    <ID>NestedBlockDepth:TwitterOAuth.kt$TwitterOAuth$ @Throws(TwitterException::class, IOException::class) @JvmStatic fun main(args: Array&lt;String&gt;)</ID>
+    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ @JvmStatic fun load(file: String): List&lt;TellMessage&gt;</ID>
+    <ID>NestedBlockDepth:TellMessagesMgr.kt$TellMessagesMgr$ @JvmStatic fun save(file: String, messages: List&lt;TellMessage?&gt;?)</ID>
+    <ID>NestedBlockDepth:TwitterOAuth.kt$TwitterOAuth$ @JvmStatic @Throws(TwitterException::class, IOException::class) fun main(args: Array&lt;String&gt;)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2$ override fun run(channel: String, cmd: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:Weather2.kt$Weather2.Companion$ @JvmStatic @Throws(ModuleException::class) fun getWeather(query: String, apiKey: String?): List&lt;Message&gt;</ID>
     <ID>ReturnCount:Addons.kt$Addons$ fun exec(channel: String, cmd: String, args: String, event: GenericMessageEvent): Boolean</ID>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e750102..84d1f85 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 99a27c2769c61b3096b0843204322fef42f243b6 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 17 Dec 2021 01:37:06 -0800
Subject: [PATCH 252/262] Upgraded to log4j 2.16.0 and Kotlin 1.6.10.

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 73b54c1..a621c9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ plugins {
     id 'io.gitlab.arturbosch.detekt' version '1.19.0'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
-    id 'org.jetbrains.kotlin.jvm' version '1.6.0'
-    id 'org.jetbrains.kotlin.kapt' version '1.6.0'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.10'
+    id 'org.jetbrains.kotlin.kapt' version '1.6.10'
     id 'org.jetbrains.kotlinx.kover' version '0.4.3'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
@@ -27,7 +27,7 @@ def isNonStable = { String version ->
 mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
-        log4j: '2.14.1',
+        log4j: '2.16.0',
         pmd  : '6.41.0',
 ]
 

From 8903d67e9c490d5d344264c91bf98007aba19711 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 17 Dec 2021 01:41:22 -0800
Subject: [PATCH 253/262] Added more tests.

---
 src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt   | 2 +-
 .../net/thauvin/erik/mobibot/commands/RecapTest.kt       | 2 +-
 .../erik/mobibot/commands/tell/TellMessagesMgrTest.kt    | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
index b618dc7..cd035cd 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
@@ -45,7 +45,7 @@ import net.thauvin.erik.mobibot.modules.Joke
 import net.thauvin.erik.mobibot.modules.RockPaperScissors
 import net.thauvin.erik.mobibot.modules.Twitter
 import org.testng.annotations.Test
-import java.util.*
+import java.util.Properties
 
 class AddonsTest {
     private val addons = Addons()
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
index 2b5ebac..3d74205 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
@@ -34,8 +34,8 @@ package net.thauvin.erik.mobibot.commands
 
 import assertk.all
 import assertk.assertThat
-import assertk.assertions.contains
 import assertk.assertions.isEqualTo
+import assertk.assertions.matches
 import assertk.assertions.prop
 import assertk.assertions.size
 import org.testng.annotations.Test
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt
index 97363cd..8279331 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt
@@ -34,7 +34,12 @@ package net.thauvin.erik.mobibot.commands.tell
 
 import assertk.all
 import assertk.assertThat
-import assertk.assertions.*
+import assertk.assertions.index
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFalse
+import assertk.assertions.isGreaterThan
+import assertk.assertions.isTrue
+import assertk.assertions.prop
 import org.testng.annotations.AfterClass
 import org.testng.annotations.BeforeClass
 import org.testng.annotations.Test
@@ -78,7 +83,7 @@ class TellMessagesMgrTest {
     fun loadTest() {
         val messages = TellMessagesMgr.load(testFile.toAbsolutePath().toString())
         for (i in messages.indices) {
-            assertThat(messages[i]).all {
+            assertThat(messages).index(i).all {
                 prop(TellMessage::sender).isEqualTo(testMessages[i].sender)
                 prop(TellMessage::recipient).isEqualTo(testMessages[i].recipient)
                 prop(TellMessage::message).isEqualTo(testMessages[i].message)

From 2573c7d59661e1ba80cbd4fcd383bb324cee5bf6 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 17 Dec 2021 01:42:02 -0800
Subject: [PATCH 254/262] Upgraded to Gradle 7.3.2

---
 .idea/misc.xml                           |  4 ++++
 .idea/runConfigurations.xml              | 10 ++++++++++
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 version.properties                       |  6 +++---
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cbfe0de..76aaf0c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <pattern value="net.thauvin.erik.mobibot.modules.War" />
+    <pattern value="net.thauvin.erik.mobibot.modules.War" method="War" />
+  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 84d1f85..d2880ba 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/version.properties b/version.properties
index d3947a4..2291461 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sun Nov 14 21:44:14 PST 2021
-version.buildmeta=2262
+#Fri Dec 17 01:31:11 PST 2021
+version.buildmeta=2422
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+2262
+version.semver=0.8.0-beta+2422

From bc2a427f48cc8f24f3bb07de4d47c2b37f9ba2c6 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 19 Dec 2021 12:42:18 -0800
Subject: [PATCH 255/262] Updated to Log4j 2.17.

---
 build.gradle       | 2 +-
 version.properties | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index a621c9f..240d0da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ def isNonStable = { String version ->
 mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
-        log4j: '2.16.0',
+        log4j: '2.17.0',
         pmd  : '6.41.0',
 ]
 
diff --git a/version.properties b/version.properties
index 2291461..dcff800 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Fri Dec 17 01:31:11 PST 2021
-version.buildmeta=2422
+#Sun Dec 19 12:39:10 PST 2021
+version.buildmeta=2423
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+2422
+version.semver=0.8.0-beta+2423

From dfc711b1802c64b147dcbacd44dcbd7ded2f8ca6 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 1 Jan 2022 06:37:44 -0800
Subject: [PATCH 256/262] Updated dependencies.

---
 build.gradle                             | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 version.properties                       |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 240d0da..143d5f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 plugins {
     id 'application'
-    id 'com.github.ben-manes.versions' version '0.39.0'
+    id 'com.github.ben-manes.versions' version '0.40.0'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.19.0'
     id 'java'
     id 'net.thauvin.erik.gradle.semver' version '1.0.4'
     id 'org.jetbrains.kotlin.jvm' version '1.6.10'
     id 'org.jetbrains.kotlin.kapt' version '1.6.10'
-    id 'org.jetbrains.kotlinx.kover' version '0.4.3'
+    id 'org.jetbrains.kotlinx.kover' version '0.4.4'
     id 'org.sonarqube' version '3.3'
     id 'pmd'
 }
@@ -27,7 +27,7 @@ def isNonStable = { String version ->
 mainClassName = packageName + '.Mobibot'
 
 ext.versions = [
-        log4j: '2.17.0',
+        log4j: '2.17.1',
         pmd  : '6.41.0',
 ]
 
@@ -51,7 +51,7 @@ dependencies {
     implementation 'com.google.guava:guava:31.0.1-jre'
 
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-RC'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
 
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
@@ -60,7 +60,7 @@ dependencies {
     implementation 'commons-cli:commons-cli:1.5.0'
     implementation 'commons-net:commons-net:3.8.0'
 
-    implementation 'com.rometools:rome:1.16.0'
+    implementation 'com.rometools:rome:1.18.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
 
     implementation 'net.aksingh:owm-japis:2.5.3.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d2880ba..2e6e589 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/version.properties b/version.properties
index dcff800..41eca0f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sun Dec 19 12:39:10 PST 2021
-version.buildmeta=2423
+#Sat Jan 01 06:34:39 PST 2022
+version.buildmeta=2428
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+2423
+version.semver=0.8.0-beta+2428

From 12bc76406bb6ac062894691d09da716496d04e72 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 1 Jan 2022 07:08:08 -0800
Subject: [PATCH 257/262] Updated copyright and licenses.

---
 LICENSE.txt                                      |  2 +-
 licenses/LICENSE.txt                             |  2 +-
 licenses/OstermillerUtil License.txt             | 16 ----------------
 licenses/jsoup License.txt                       |  2 +-
 .../net/thauvin/erik/mobibot/modules/War.java    |  2 +-
 .../kotlin/net/thauvin/erik/mobibot/Addons.kt    |  2 +-
 .../kotlin/net/thauvin/erik/mobibot/Constants.kt |  2 +-
 .../net/thauvin/erik/mobibot/FeedReader.kt       |  2 +-
 .../kotlin/net/thauvin/erik/mobibot/Mobibot.kt   |  2 +-
 .../kotlin/net/thauvin/erik/mobibot/Pinboard.kt  |  2 +-
 .../net/thauvin/erik/mobibot/TwitterOAuth.kt     |  2 +-
 .../net/thauvin/erik/mobibot/TwitterTimer.kt     |  2 +-
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt     |  2 +-
 .../erik/mobibot/commands/AbstractCommand.kt     |  2 +-
 .../thauvin/erik/mobibot/commands/ChannelFeed.kt |  2 +-
 .../net/thauvin/erik/mobibot/commands/Cycle.kt   |  2 +-
 .../net/thauvin/erik/mobibot/commands/Die.kt     |  2 +-
 .../net/thauvin/erik/mobibot/commands/Ignore.kt  |  2 +-
 .../net/thauvin/erik/mobibot/commands/Info.kt    |  2 +-
 .../net/thauvin/erik/mobibot/commands/Me.kt      |  2 +-
 .../net/thauvin/erik/mobibot/commands/Modules.kt |  2 +-
 .../net/thauvin/erik/mobibot/commands/Msg.kt     |  2 +-
 .../net/thauvin/erik/mobibot/commands/Nick.kt    |  2 +-
 .../net/thauvin/erik/mobibot/commands/Recap.kt   |  2 +-
 .../net/thauvin/erik/mobibot/commands/Say.kt     |  2 +-
 .../net/thauvin/erik/mobibot/commands/Users.kt   |  2 +-
 .../thauvin/erik/mobibot/commands/Versions.kt    |  2 +-
 .../erik/mobibot/commands/links/Comment.kt       |  2 +-
 .../erik/mobibot/commands/links/LinksMgr.kt      |  2 +-
 .../erik/mobibot/commands/links/Posting.kt       |  2 +-
 .../thauvin/erik/mobibot/commands/links/Tags.kt  |  2 +-
 .../thauvin/erik/mobibot/commands/links/View.kt  |  2 +-
 .../thauvin/erik/mobibot/commands/tell/Tell.kt   |  2 +-
 .../erik/mobibot/commands/tell/TellMessage.kt    |  2 +-
 .../mobibot/commands/tell/TellMessagesMgr.kt     |  2 +-
 .../net/thauvin/erik/mobibot/entries/Entries.kt  |  2 +-
 .../thauvin/erik/mobibot/entries/EntriesUtils.kt |  2 +-
 .../thauvin/erik/mobibot/entries/EntryComment.kt |  2 +-
 .../thauvin/erik/mobibot/entries/EntryLink.kt    |  2 +-
 .../net/thauvin/erik/mobibot/entries/FeedsMgr.kt |  2 +-
 .../erik/mobibot/modules/AbstractModule.kt       |  2 +-
 .../net/thauvin/erik/mobibot/modules/Calc.kt     |  2 +-
 .../thauvin/erik/mobibot/modules/CryptoPrices.kt |  2 +-
 .../erik/mobibot/modules/CurrencyConverter.kt    |  2 +-
 .../net/thauvin/erik/mobibot/modules/Dice.kt     |  2 +-
 .../thauvin/erik/mobibot/modules/GoogleSearch.kt |  2 +-
 .../net/thauvin/erik/mobibot/modules/Joke.kt     |  2 +-
 .../net/thauvin/erik/mobibot/modules/Lookup.kt   |  2 +-
 .../erik/mobibot/modules/ModuleException.kt      |  2 +-
 .../net/thauvin/erik/mobibot/modules/Ping.kt     |  2 +-
 .../erik/mobibot/modules/RockPaperScissors.kt    |  2 +-
 .../thauvin/erik/mobibot/modules/StockQuote.kt   |  2 +-
 .../erik/mobibot/modules/ThreadedModule.kt       |  2 +-
 .../net/thauvin/erik/mobibot/modules/Twitter.kt  |  2 +-
 .../net/thauvin/erik/mobibot/modules/Weather2.kt |  2 +-
 .../thauvin/erik/mobibot/modules/WorldTime.kt    |  2 +-
 .../net/thauvin/erik/mobibot/msg/ErrorMessage.kt |  2 +-
 .../net/thauvin/erik/mobibot/msg/Message.kt      |  2 +-
 .../thauvin/erik/mobibot/msg/NoticeMessage.kt    |  2 +-
 .../thauvin/erik/mobibot/msg/PrivateMessage.kt   |  2 +-
 .../thauvin/erik/mobibot/msg/PublicMessage.kt    |  2 +-
 .../net/thauvin/erik/mobibot/AddonsTest.kt       |  2 +-
 .../thauvin/erik/mobibot/ExceptionSanitizer.kt   |  2 +-
 .../net/thauvin/erik/mobibot/FeedReaderTest.kt   |  2 +-
 .../net/thauvin/erik/mobibot/LocalProperties.kt  |  2 +-
 .../net/thauvin/erik/mobibot/PinboardTest.kt     |  2 +-
 .../kotlin/net/thauvin/erik/mobibot/UtilsTest.kt |  2 +-
 .../thauvin/erik/mobibot/commands/RecapTest.kt   |  2 +-
 .../erik/mobibot/commands/links/LinksMgrTest.kt  |  2 +-
 .../erik/mobibot/commands/links/ViewTest.kt      |  2 +-
 .../mobibot/commands/tell/TellMessageTest.kt     |  2 +-
 .../mobibot/commands/tell/TellMessagesMgrTest.kt |  2 +-
 .../erik/mobibot/entries/EntriesUtilsTest.kt     |  2 +-
 .../erik/mobibot/entries/EntryLinkTest.kt        |  2 +-
 .../thauvin/erik/mobibot/entries/FeedMgrTest.kt  |  2 +-
 .../net/thauvin/erik/mobibot/modules/CalcTest.kt |  2 +-
 .../erik/mobibot/modules/CryptoPricesTest.kt     |  2 +-
 .../mobibot/modules/CurrencyConverterTest.kt     |  2 +-
 .../net/thauvin/erik/mobibot/modules/DiceTest.kt |  2 +-
 .../erik/mobibot/modules/GoogleSearchTest.kt     |  2 +-
 .../net/thauvin/erik/mobibot/modules/JokeTest.kt |  2 +-
 .../thauvin/erik/mobibot/modules/LookupTest.kt   |  2 +-
 .../erik/mobibot/modules/ModuleExceptionTest.kt  |  2 +-
 .../net/thauvin/erik/mobibot/modules/PingTest.kt |  2 +-
 .../mobibot/modules/RockPaperScissorsTest.kt     |  2 +-
 .../erik/mobibot/modules/StockQuoteTest.kt       |  2 +-
 .../thauvin/erik/mobibot/modules/TwitterTest.kt  |  2 +-
 .../thauvin/erik/mobibot/modules/Weather2Test.kt |  2 +-
 .../thauvin/erik/mobibot/modules/WordTimeTest.kt |  2 +-
 .../net/thauvin/erik/mobibot/msg/TestMessage.kt  |  2 +-
 90 files changed, 89 insertions(+), 105 deletions(-)
 delete mode 100644 licenses/OstermillerUtil License.txt

diff --git a/LICENSE.txt b/LICENSE.txt
index 1cd28ec..085f7c7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/licenses/LICENSE.txt b/licenses/LICENSE.txt
index 1cd28ec..085f7c7 100644
--- a/licenses/LICENSE.txt
+++ b/licenses/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/licenses/OstermillerUtil License.txt b/licenses/OstermillerUtil License.txt
deleted file mode 100644
index 7b9549c..0000000
--- a/licenses/OstermillerUtil License.txt	
+++ /dev/null
@@ -1,16 +0,0 @@
-License (http://ostermiller.org/utils/)
-
-Copyright (C) 2004-2010 Stephen Ostermiller
-http://ostermiller.org/contact.pl?regarding=Java+Utilities
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-See the GNU General Public License (https://ostermiller.org/utils/license.html) for more details.
diff --git a/licenses/jsoup License.txt b/licenses/jsoup License.txt
index 4d95827..31b785d 100644
--- a/licenses/jsoup License.txt	
+++ b/licenses/jsoup License.txt	
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2018 Jonathan Hedley <jonathan@hedley.net>
+Copyright (c) 2009-2022 Jonathan Hedley <jonathan@hedley.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index c286091..16102b4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -1,7 +1,7 @@
 /*
  * War.java
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
index 716d829..e530ae8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
@@ -1,7 +1,7 @@
 /*
  * Addons.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
index dfe25dc..f96e30b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Constants.kt
@@ -1,7 +1,7 @@
 /*
  * Constants.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
index a61a6a7..8fc4f2a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/FeedReader.kt
@@ -1,7 +1,7 @@
 /*
  * FeedReader.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 62e0fca..ef6f842 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -1,7 +1,7 @@
 /*
  * Mobibot.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt
index 16bd365..9d46188 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Pinboard.kt
@@ -1,7 +1,7 @@
 /*
  * Pinboard.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
index 345943b..3df1c0a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterOAuth.kt
@@ -1,7 +1,7 @@
 /*
  * TwitterOAuth.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
index 374f301..09bfa46 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/TwitterTimer.kt
@@ -1,7 +1,7 @@
 /*
  * TwitterTimer.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index f489194..38fafa7 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -1,7 +1,7 @@
 /*
  * Utils.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
index 425f309..674fe0f 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/AbstractCommand.kt
@@ -1,7 +1,7 @@
 /*
  * AbstractCommand.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
index 9610592..cc80595 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/ChannelFeed.kt
@@ -1,7 +1,7 @@
 /*
  * ChannelFeed.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
index 00d6638..8c6e777 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Cycle.kt
@@ -1,7 +1,7 @@
 /*
  * Cycle.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
index df715c4..26f05c3 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Die.kt
@@ -1,7 +1,7 @@
 /*
  * Die.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
index 2dc04ca..afd9bf4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Ignore.kt
@@ -1,7 +1,7 @@
 /*
  * Ignore.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
index 41065ff..27521ef 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Info.kt
@@ -1,7 +1,7 @@
 /*
  * Info.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
index 7a85f4f..f1098fa 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Me.kt
@@ -1,7 +1,7 @@
 /*
  * Me.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
index 36a4baf..9ed298c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -1,7 +1,7 @@
 /*
  * Modules.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
index edd9cc9..8bd4b37 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Msg.kt
@@ -1,7 +1,7 @@
 /*
  * Msg.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
index c8275dd..c864763 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Nick.kt
@@ -1,7 +1,7 @@
 /*
  * Nick.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
index 6fe1e36..3647bcc 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Recap.kt
@@ -1,7 +1,7 @@
 /*
  * Recap.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
index 34b4aec..c03a221 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Say.kt
@@ -1,7 +1,7 @@
 /*
  * Say.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
index e643858..fddb9be 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Users.kt
@@ -1,7 +1,7 @@
 /*
  * Users.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
index f7fa866..2875e06 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Versions.kt
@@ -1,7 +1,7 @@
 /*
  * Versions.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
index 5b137ff..59f31c8 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Comment.kt
@@ -1,7 +1,7 @@
 /*
  * Comment.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
index 07abbf5..8485be0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgr.kt
@@ -1,7 +1,7 @@
 /*
  * LinksMgr.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
index 1a43c03..670daeb 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Posting.kt
@@ -1,7 +1,7 @@
 /*
  * Posting.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
index 2970033..7c0d904 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/Tags.kt
@@ -1,7 +1,7 @@
 /*
  * Tags.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
index e3b731e..f853cae 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/links/View.kt
@@ -1,7 +1,7 @@
 /*
  * View.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
index c3a0b65..1100c99 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/Tell.kt
@@ -1,7 +1,7 @@
 /*
  * Tell.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
index f1bdabd..a504c92 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessage.kt
@@ -1,7 +1,7 @@
 /*
  * TellMessage.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
index e61b814..bb2f8cd 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgr.kt
@@ -1,7 +1,7 @@
 /*
  * TellMessagesMgr.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/Entries.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/Entries.kt
index 78602f6..a775168 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/Entries.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/Entries.kt
@@ -1,7 +1,7 @@
 /*
  * Entries.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
index 02cfd4d..023ec86 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtils.kt
@@ -1,7 +1,7 @@
 /*
  * EntriesUtils.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt
index be442d5..b0b138a 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryComment.kt
@@ -1,7 +1,7 @@
 /*
  * EntryComment.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
index 29f90d7..9177ebe 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/EntryLink.kt
@@ -1,7 +1,7 @@
 /*
  * EntryLink.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt b/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt
index 5891720..9060146 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/entries/FeedsMgr.kt
@@ -1,7 +1,7 @@
 /*
  * FeedsMgr.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index 372ef2d..dd5d3d5 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -1,7 +1,7 @@
 /*
  * AbstractModule.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
index 25ae072..29c0805 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -1,7 +1,7 @@
 /*
  * Calc.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index 35b0b86..57e3dc4 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -1,7 +1,7 @@
 /*
  * CryptoPrices.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 16687f6..275e99c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -1,7 +1,7 @@
 /*
  * CurrencyConverter.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 848df2c..667a0b0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -1,7 +1,7 @@
 /*
  * Dice.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index efe52ec..a0658bc 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -1,7 +1,7 @@
 /*
  * GoogleSearch.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
index 26d7af3..ff5c030 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -1,7 +1,7 @@
 /*
  * Joke.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
index 83caf6e..f6ae628 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -1,7 +1,7 @@
 /*
  * Lookup.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
index cf06b4e..2f39854 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ModuleException.kt
@@ -1,7 +1,7 @@
 /*
  * ModuleException.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
index 3be959e..b4876de 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
@@ -1,7 +1,7 @@
 /*
  * Ping.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 9dba554..95eb5e2 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -1,7 +1,7 @@
 /*
  * RockPaperScissors.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index a1f17c4..240ea0e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -1,7 +1,7 @@
 /*
  * StockQuote.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
index b44aab1..269b24d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/ThreadedModule.kt
@@ -1,7 +1,7 @@
 /*
  * ThreadedModule.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
index c813392..61fbd1b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -1,7 +1,7 @@
 /*
  * Twitter.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index f5f1e16..bdc5de9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -1,7 +1,7 @@
 /*
  * Weather2.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index b5c80eb..7160d15 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -1,7 +1,7 @@
 /*
  * WorldTime.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
index f071918..ae5651c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
@@ -1,7 +1,7 @@
 /*
  * ErrorMessage.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
index 1d2e5bc..2e51c02 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/Message.kt
@@ -1,7 +1,7 @@
 /*
  * Message.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
index d2353b8..f88b8dd 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
@@ -1,7 +1,7 @@
 /*
  * NoticeMessage.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
index 6edcb96..827b682 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
@@ -1,7 +1,7 @@
 /*
  * PrivateMessage.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
index 9df2770..71b2a5b 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/msg/PublicMessage.kt
@@ -1,7 +1,7 @@
 /*
  * PublicMessage.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
index cd035cd..33cca2e 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
@@ -1,7 +1,7 @@
 /*
  * AddonsTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/ExceptionSanitizer.kt b/src/test/kotlin/net/thauvin/erik/mobibot/ExceptionSanitizer.kt
index 1660df7..ba486f0 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/ExceptionSanitizer.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/ExceptionSanitizer.kt
@@ -1,7 +1,7 @@
 /*
  * ExceptionSanitizer.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
index b828d68..e0e6aa3 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
@@ -1,7 +1,7 @@
 /*
  * FeedReaderTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt b/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
index b764ab6..9249006 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/LocalProperties.kt
@@ -1,7 +1,7 @@
 /*
  * LocalProperties.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardTest.kt
index 76b5b95..70c6b28 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/PinboardTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/PinboardTest.kt
@@ -1,7 +1,7 @@
 /*
  * PinboardTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index 0cc1b41..06bb589 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -1,7 +1,7 @@
 /*
  * UtilsTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
index 3d74205..ea3432e 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/RecapTest.kt
@@ -1,7 +1,7 @@
 /*
  * RecapTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgrTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgrTest.kt
index 12fccbd..551ee1d 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgrTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/LinksMgrTest.kt
@@ -1,7 +1,7 @@
 /*
  * LinksMgrTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt
index dae5cb4..f5f30be 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/links/ViewTest.kt
@@ -1,7 +1,7 @@
 /*
  * ViewTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
index 6618f90..436b81d 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessageTest.kt
@@ -1,7 +1,7 @@
 /*
  * TellMessageTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt
index 8279331..a2563c3 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/commands/tell/TellMessagesMgrTest.kt
@@ -1,7 +1,7 @@
 /*
  * TellMessagesMgrTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtilsTest.kt
index ab4ec8e..3b39be4 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntriesUtilsTest.kt
@@ -1,7 +1,7 @@
 /*
  * EntriesUtilsTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
index 94a6b7e..36244de 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/EntryLinkTest.kt
@@ -1,7 +1,7 @@
 /*
  * EntryLinkTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt
index 271fc4c..da0877d 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/entries/FeedMgrTest.kt
@@ -1,7 +1,7 @@
 /*
  * FeedMgrTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
index b37a09c..3d125f8 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -1,7 +1,7 @@
 /*
  * CalcTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
index e5f5e52..ca676d3 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
@@ -1,7 +1,7 @@
 /*
  * CryptoPricesTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
index 962e2c2..8ba5c3b 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.kt
@@ -1,7 +1,7 @@
 /*
  * CurrencyConverterTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
index dfebd9d..a4a84c8 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/DiceTest.kt
@@ -1,7 +1,7 @@
 /*
  * DiceTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
index fd7b4c7..003e825 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearchTest.kt
@@ -1,7 +1,7 @@
 /*
  * GoogleSearchTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
index 865a65f..65c259b 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/JokeTest.kt
@@ -1,7 +1,7 @@
 /*
  * JokeTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
index b0fdfcd..b915357 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/LookupTest.kt
@@ -1,7 +1,7 @@
 /*
  * LookupTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
index 5791867..37ba63b 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/ModuleExceptionTest.kt
@@ -1,7 +1,7 @@
 /*
  * ModuleExceptionTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
index 34cbfbb..247bf94 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/PingTest.kt
@@ -1,7 +1,7 @@
 /*
  * PingTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
index 499c28c..66e95d0 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissorsTest.kt
@@ -1,7 +1,7 @@
 /*
  * RockPaperScissorsTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
index 8812c21..57dcb4c 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/StockQuoteTest.kt
@@ -1,7 +1,7 @@
 /*
  * StockQuoteTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
index 379e15a..29ae3c4 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/TwitterTest.kt
@@ -1,7 +1,7 @@
 /*
  * TwitterTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
index 27b95c2..315fa06 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/Weather2Test.kt
@@ -1,7 +1,7 @@
 /*
  * Weather2Test.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
index abe9416..09ac600 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/WordTimeTest.kt
@@ -1,7 +1,7 @@
 /*
  * WordTimeTest.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
index 50f8843..ef4be2c 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/msg/TestMessage.kt
@@ -1,7 +1,7 @@
 /*
  * TestMessage.kt
  *
- * Copyright (c) 2004-2021, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2022, Erik C. Thauvin (erik@thauvin.net)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

From e4dd6d5254e0cd7c8fb483c4aefd1d80274a5f17 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 8 Jan 2022 23:11:44 -0800
Subject: [PATCH 258/262] Added support for disabled-modules and
 disabled-commands properties.

---
 build.gradle                                  |  4 +-
 config/detekt/baseline.xml                    |  3 +-
 properties/mobibot.properties                 |  5 +-
 .../net/thauvin/erik/mobibot/modules/War.java |  6 ++
 .../kotlin/net/thauvin/erik/mobibot/Addons.kt | 53 ++++++++------
 .../net/thauvin/erik/mobibot/Mobibot.kt       | 70 ++++++++++---------
 .../kotlin/net/thauvin/erik/mobibot/Utils.kt  |  8 ++-
 .../erik/mobibot/modules/AbstractModule.kt    |  5 ++
 .../net/thauvin/erik/mobibot/modules/Calc.kt  |  2 +
 .../erik/mobibot/modules/CryptoPrices.kt      |  2 +
 .../erik/mobibot/modules/CurrencyConverter.kt |  2 +
 .../net/thauvin/erik/mobibot/modules/Dice.kt  |  2 +
 .../erik/mobibot/modules/GoogleSearch.kt      |  2 +
 .../net/thauvin/erik/mobibot/modules/Joke.kt  |  2 +
 .../thauvin/erik/mobibot/modules/Lookup.kt    |  2 +
 .../net/thauvin/erik/mobibot/modules/Ping.kt  |  5 +-
 .../erik/mobibot/modules/RockPaperScissors.kt |  2 +
 .../erik/mobibot/modules/StockQuote.kt        |  2 +
 .../thauvin/erik/mobibot/modules/Twitter.kt   |  2 +
 .../thauvin/erik/mobibot/modules/Weather2.kt  |  2 +
 .../thauvin/erik/mobibot/modules/WorldTime.kt |  2 +
 .../net/thauvin/erik/mobibot/AddonsTest.kt    | 38 +++++-----
 version.properties                            |  6 +-
 23 files changed, 144 insertions(+), 83 deletions(-)

diff --git a/build.gradle b/build.gradle
index 143d5f1..f62606e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'application'
-    id 'com.github.ben-manes.versions' version '0.40.0'
+    id 'com.github.ben-manes.versions' version '0.41.0'
     id 'idea'
     id 'io.gitlab.arturbosch.detekt' version '1.19.0'
     id 'java'
@@ -78,7 +78,7 @@ dependencies {
     testImplementation 'com.willowtreeapps.assertk:assertk-jvm:0.25'
 //    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
 //    testImplementation "org.mockito:mockito-core:4.0.0"
-    testImplementation 'org.testng:testng:7.4.0'
+    testImplementation 'org.testng:testng:7.5'
 }
 
 test {
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 7f49882..5f0626e 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -42,7 +42,8 @@
     <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$3600</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$60</ID>
     <ID>MagicNumber:WorldTime.kt$WorldTime.Companion$86.4</ID>
-    <ID>NestedBlockDepth:Addons.kt$Addons$ fun add(command: AbstractCommand, props: Properties)</ID>
+    <ID>NestedBlockDepth:Addons.kt$Addons$ fun add(command: AbstractCommand)</ID>
+    <ID>NestedBlockDepth:Addons.kt$Addons$ fun add(module: AbstractModule)</ID>
     <ID>NestedBlockDepth:Comment.kt$Comment$override fun commandResponse(channel: String, args: String, event: GenericMessageEvent)</ID>
     <ID>NestedBlockDepth:CurrencyConverter.kt$CurrencyConverter.Companion$ @JvmStatic fun convertCurrency(query: String): Message</ID>
     <ID>NestedBlockDepth:EntryLink.kt$EntryLink$ private fun setTags(tags: List&lt;String?&gt;)</ID>
diff --git a/properties/mobibot.properties b/properties/mobibot.properties
index 67326f3..28f5a8d 100644
--- a/properties/mobibot.properties
+++ b/properties/mobibot.properties
@@ -1,5 +1,5 @@
 channel=#mobitopia
-server=irc.freenode.net
+server=irc.libera.chat
 #port=6667
 login=mobibot
 nick=mobibot
@@ -24,6 +24,9 @@ backlogs=http://www.mobitopia.org/mobibot/logs
 tell-max-days=5
 tell-max-size=50
 
+#disabled-commands=die, ignore
+#disabled-modules=dice, joke
+
 #
 # Credentials for: http://pinboard.in/
 #
diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/War.java b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
index 16102b4..5565ecb 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/War.java
@@ -75,6 +75,12 @@ public final class War extends AbstractModule {
         help.add(Utils.helpFormat("%c " + WAR_CMD));
     }
 
+    @NotNull
+    @Override
+    public String getName() {
+        return "War";
+    }
+
     /**
      * {@inheritDoc}
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
index e530ae8..4e95ad0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
@@ -31,7 +31,9 @@
  */
 package net.thauvin.erik.mobibot
 
+import net.thauvin.erik.mobibot.Utils.notContains
 import net.thauvin.erik.mobibot.commands.AbstractCommand
+import net.thauvin.erik.mobibot.commands.links.LinksMgr
 import net.thauvin.erik.mobibot.modules.AbstractModule
 import org.pircbotx.hooks.events.PrivateMessageEvent
 import org.pircbotx.hooks.types.GenericMessageEvent
@@ -40,7 +42,10 @@ import java.util.Properties
 /**
  * Modules and Commands addons.
  */
-class Addons {
+class Addons(private val props: Properties) {
+    private val disabledModules = props.getProperty("disabled-modules", "").split(LinksMgr.TAG_MATCH.toRegex())
+    private val disableCommands = props.getProperty("disabled-commands", "").split(LinksMgr.TAG_MATCH.toRegex())
+
     val commands: MutableList<AbstractCommand> = mutableListOf()
     val modules: MutableList<AbstractModule> = mutableListOf()
     val modulesNames: MutableList<String> = mutableListOf()
@@ -50,18 +55,20 @@ class Addons {
     /**
      * Add a module with properties.
      */
-    fun add(module: AbstractModule, props: Properties) {
+    fun add(module: AbstractModule) {
         with(module) {
-            if (hasProperties()) {
-                propertyKeys.forEach {
-                    setProperty(it, props.getProperty(it, ""))
+            if (disabledModules.notContains(name, true)) {
+                if (hasProperties()) {
+                    propertyKeys.forEach {
+                        setProperty(it, props.getProperty(it, ""))
+                    }
                 }
-            }
 
-            if (isEnabled) {
-                modules.add(this)
-                modulesNames.add(javaClass.simpleName)
-                names.addAll(commands)
+                if (isEnabled) {
+                    modules.add(this)
+                    modulesNames.add(name)
+                    names.addAll(commands)
+                }
             }
         }
     }
@@ -69,20 +76,22 @@ class Addons {
     /**
      * Add a command with properties.
      */
-    fun add(command: AbstractCommand, props: Properties) {
+    fun add(command: AbstractCommand) {
         with(command) {
-            if (properties.isNotEmpty()) {
-                properties.keys.forEach {
-                    setProperty(it, props.getProperty(it, ""))
+            if (disableCommands.notContains(name, true)) {
+                if (properties.isNotEmpty()) {
+                    properties.keys.forEach {
+                        setProperty(it, props.getProperty(it, ""))
+                    }
                 }
-            }
-            if (isEnabled()) {
-                commands.add(this)
-                if (isVisible) {
-                    if (isOpOnly) {
-                        ops.add(name)
-                    } else {
-                        names.add(name)
+                if (isEnabled()) {
+                    commands.add(this)
+                    if (isVisible) {
+                        if (isOpOnly) {
+                            ops.add(name)
+                        } else {
+                            names.add(name)
+                        }
                     }
                 }
             }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index ef6f842..02467d6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -112,7 +112,7 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
     private val config: Configuration
 
     // Commands and Modules
-    private val addons = Addons()
+    private val addons: Addons
 
     // Tell module
     private val tell: Tell
@@ -391,46 +391,48 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
             pinboard.setApiToken(p.getProperty("pinboard-api-token", ""))
         }
 
+        addons = Addons(p)
+
         // Load the commands
-        addons.add(ChannelFeed(channel.removePrefix("#")), p)
-        addons.add(Comment(), p)
-        addons.add(Cycle(), p)
-        addons.add(Die(), p)
-        addons.add(Ignore(), p)
-        addons.add(LinksMgr(), p)
-        addons.add(Me(), p)
-        addons.add(Msg(), p)
-        addons.add(Nick(), p)
-        addons.add(Posting(), p)
-        addons.add(Recap(), p)
-        addons.add(Say(), p)
-        addons.add(Tags(), p)
+        addons.add(ChannelFeed(channel.removePrefix("#")))
+        addons.add(Comment())
+        addons.add(Cycle())
+        addons.add(Die())
+        addons.add(Ignore())
+        addons.add(LinksMgr())
+        addons.add(Me())
+        addons.add(Msg())
+        addons.add(Nick())
+        addons.add(Posting())
+        addons.add(Recap())
+        addons.add(Say())
+        addons.add(Tags())
 
         // Tell command
         tell = Tell("${logsDirPath}${nickname}.ser")
-        addons.add(tell, p)
+        addons.add(tell)
 
-        addons.add(LinksMgr.twitter, p)
-        addons.add(Users(), p)
-        addons.add(Versions(), p)
-        addons.add(View(), p)
+        addons.add(LinksMgr.twitter)
+        addons.add(Users())
+        addons.add(Versions())
+        addons.add(View())
 
         // Load the modules
-        addons.add(Calc(), p)
-        addons.add(CryptoPrices(), p)
-        addons.add(CurrencyConverter(), p)
-        addons.add(Dice(), p)
-        addons.add(GoogleSearch(), p)
-        addons.add(Info(tell), p)
-        addons.add(Joke(), p)
-        addons.add(Lookup(), p)
-        addons.add(Modules(addons.modulesNames), p)
-        addons.add(Ping(), p)
-        addons.add(RockPaperScissors(), p)
-        addons.add(StockQuote(), p)
-        addons.add(Weather2(), p)
-        addons.add(WorldTime(), p)
-        addons.add(War(), p)
+        addons.add(Calc())
+        addons.add(CryptoPrices())
+        addons.add(CurrencyConverter())
+        addons.add(Dice())
+        addons.add(GoogleSearch())
+        addons.add(Info(tell))
+        addons.add(Joke())
+        addons.add(Lookup())
+        addons.add(Modules(addons.modulesNames))
+        addons.add(Ping())
+        addons.add(RockPaperScissors())
+        addons.add(StockQuote())
+        addons.add(Weather2())
+        addons.add(WorldTime())
+        addons.add(War())
 
         // Sort the addons
         addons.sort()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
index 38fafa7..b68ee47 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt
@@ -180,7 +180,7 @@ object Utils {
     }
 
     /**
-     * Return the last item of a list of strings or empty if none.
+     * Returns the last item of a list of strings or empty if none.
      */
     @JvmStatic
     fun List<String>.lastOrEmpty(): String {
@@ -190,6 +190,12 @@ object Utils {
             ""
     }
 
+    /**
+     * Returns {@code true} if the list does not contain the given string.
+     */
+    @JvmStatic
+    fun List<String>.notContains(text: String, ignoreCase: Boolean = false) = this.none { it.equals(text, ignoreCase) }
+
     /**
      * Obfuscates the given string.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
index dd5d3d5..25e7c9d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/AbstractModule.kt
@@ -41,6 +41,11 @@ import org.pircbotx.hooks.types.GenericMessageEvent
  * The `Module` abstract class.
  */
 abstract class AbstractModule {
+    /**
+     * The module name.
+     */
+    abstract val name: String
+
     /**
      * The module's commands, if any.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
index 29c0805..76f3786 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Calc.kt
@@ -46,6 +46,8 @@ import java.text.DecimalFormat
 class Calc : AbstractModule() {
     private val logger: Logger = LoggerFactory.getLogger(Calc::class.java)
 
+    override val name = "Calc"
+
     override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         if (args.isNotBlank()) {
             try {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
index 57e3dc4..8cb3396 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CryptoPrices.kt
@@ -47,6 +47,8 @@ import java.io.IOException
 class CryptoPrices : ThreadedModule() {
     private val logger: Logger = LoggerFactory.getLogger(CryptoPrices::class.java)
 
+    override val name = "CryptoPrices"
+
     /**
      * Returns the cryptocurrency market price from [Coinbase](https://developers.coinbase.com/api/v2#get-spot-price).
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
index 275e99c..f6de896 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/CurrencyConverter.kt
@@ -59,6 +59,8 @@ import javax.xml.XMLConstants
 class CurrencyConverter : ThreadedModule() {
     private val logger: Logger = LoggerFactory.getLogger(CurrencyConverter::class.java)
 
+    override val name = "CurrencyConverter"
+
     override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         synchronized(this) {
             if (pubDate != today()) {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
index 667a0b0..9e7725d 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Dice.kt
@@ -40,6 +40,8 @@ import org.pircbotx.hooks.types.GenericMessageEvent
  * The Dice module.
  */
 class Dice : AbstractModule() {
+    override val name = "Dice"
+
     override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         val botRoll = roll()
         val roll = roll()
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
index a0658bc..6adffdd 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/GoogleSearch.kt
@@ -55,6 +55,8 @@ import java.net.URL
 class GoogleSearch : ThreadedModule() {
     private val logger: Logger = LoggerFactory.getLogger(GoogleSearch::class.java)
 
+    override val name = "GoogleSearch"
+
     /**
      * Searches Google.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
index ff5c030..6922698 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
@@ -54,6 +54,8 @@ import java.net.URL
 class Joke : ThreadedModule() {
     private val logger: Logger = LoggerFactory.getLogger(Joke::class.java)
 
+    override val name = "Joke"
+
     override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         runBlocking {
             launch { run(channel, cmd, args, event) }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
index f6ae628..90a0316 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Lookup.kt
@@ -48,6 +48,8 @@ import java.net.UnknownHostException
 class Lookup : AbstractModule() {
     private val logger: Logger = LoggerFactory.getLogger(Lookup::class.java)
 
+    override val name = "Lookup"
+
     override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         if (args.matches("(\\S.)+(\\S)+".toRegex())) {
             try {
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
index b4876de..0818120 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Ping.kt
@@ -39,9 +39,8 @@ import org.pircbotx.hooks.types.GenericMessageEvent
  * The Ping module.
  */
 class Ping : AbstractModule() {
-    /**
-     * {@inheritDoc}
-     */
+    override val name = "Ping"
+
     override fun commandResponse(channel: String, cmd: String, args: String, event: GenericMessageEvent) {
         event.bot().sendIRC().action(channel, randomPing())
     }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
index 95eb5e2..c092548 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/RockPaperScissors.kt
@@ -42,6 +42,8 @@ import org.pircbotx.hooks.types.GenericMessageEvent
  * Simple module example in Kotlin.
  */
 class RockPaperScissors : AbstractModule() {
+    override val name = "RockPaperScissors"
+
     init {
         with(commands) {
             add(Hands.ROCK.name.lowercase())
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
index 240ea0e..63d358c 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/StockQuote.kt
@@ -55,6 +55,8 @@ import java.net.URL
 class StockQuote : ThreadedModule() {
     private val logger: Logger = LoggerFactory.getLogger(StockQuote::class.java)
 
+    override val name = "StockQuote"
+
     /**
      * Returns the specified stock quote from Alpha Vantage.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
index 61fbd1b..74f0ba0 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Twitter.kt
@@ -57,6 +57,8 @@ class Twitter : ThreadedModule() {
     // Twitter auto-posts.
     private val entries: MutableSet<Int> = HashSet()
 
+    override val name = "Twitter"
+
     /**
      * Add an entry to be posted on Twitter.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
index bdc5de9..96ae93e 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Weather2.kt
@@ -57,6 +57,8 @@ import kotlin.math.roundToInt
 class Weather2 : ThreadedModule() {
     private val logger: Logger = LoggerFactory.getLogger(Weather2::class.java)
 
+    override val name = "Weather"
+
     /**
      * Fetches the weather data from a specific city.
      */
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
index 7160d15..fc0edf6 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/WorldTime.kt
@@ -45,6 +45,8 @@ import java.time.temporal.ChronoField
  * The WorldTime module.
  */
 class WorldTime : AbstractModule() {
+    override val name = "WorldTime"
+
     companion object {
         /**
          * Beats (Internet Time) keyword
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
index 33cca2e..54346a9 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
@@ -41,35 +41,43 @@ import net.thauvin.erik.mobibot.commands.Die
 import net.thauvin.erik.mobibot.commands.Ignore
 import net.thauvin.erik.mobibot.commands.links.Comment
 import net.thauvin.erik.mobibot.commands.links.View
+import net.thauvin.erik.mobibot.modules.Dice
 import net.thauvin.erik.mobibot.modules.Joke
+import net.thauvin.erik.mobibot.modules.Lookup
 import net.thauvin.erik.mobibot.modules.RockPaperScissors
 import net.thauvin.erik.mobibot.modules.Twitter
+import net.thauvin.erik.mobibot.modules.War
 import org.testng.annotations.Test
 import java.util.Properties
 
 class AddonsTest {
-    private val addons = Addons()
+    private val p = Properties().apply {
+        put("disabled-modules", "war,dice Lookup")
+        put("disabled-commands", "View | comment")
+    }
+    private val addons = Addons(p)
 
     @Test
     fun addTest() {
-        val p = Properties()
-
         // Modules
-        addons.add(Joke(), p)
-        addons.add(RockPaperScissors(), p)
-        addons.add(Twitter(), p) // no properties, disabled.
+        addons.add(Joke())
+        addons.add(RockPaperScissors())
+        addons.add(Twitter()) // no properties, disabled.
+        addons.add(War())
+        addons.add(Dice())
+        addons.add(Lookup())
         assertThat(addons.modules.size, "modules = 2").isEqualTo(2)
-
         assertThat(addons.modulesNames, "module names").containsExactly("Joke", "RockPaperScissors")
 
         // Commands
-        addons.add(View(), p)
-        addons.add(Comment(), p)
-        addons.add(Cycle(), p)
-        addons.add(Die(), p) // invisible
-        addons.add(ChannelFeed("channel"), p) // no properties, disabled
-        addons.add(Ignore(), p.apply { put(Ignore.IGNORE_PROP, "nick") })
-        assertThat(addons.commands.size, "commands = 4").isEqualTo(5)
+        addons.add(View())
+        addons.add(Comment())
+        addons.add(Cycle())
+        addons.add(Die()) // invisible
+        addons.add(ChannelFeed("channel")) // no properties, disabled
+        p[Ignore.IGNORE_PROP] = "nick"
+        addons.add(Ignore())
+        assertThat(addons.commands.size, "commands = 3").isEqualTo(3)
 
         assertThat(addons.ops, "ops").containsExactly("cycle")
 
@@ -78,8 +86,6 @@ class AddonsTest {
             "rock",
             "paper",
             "scissors",
-            "view",
-            "comment",
             "ignore"
         )
     }
diff --git a/version.properties b/version.properties
index 41eca0f..4aea8d8 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Jan 01 06:34:39 PST 2022
-version.buildmeta=2428
+#Sat Jan 08 23:07:31 PST 2022
+version.buildmeta=2440
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+2428
+version.semver=0.8.0-beta+2440

From c99d2ce805b2520975425a3fd29cc7d62af3c3c5 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 16 Jan 2022 18:31:38 -0800
Subject: [PATCH 259/262] Updated dependencies.

---
 build.gradle | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index f62606e..fdc6286 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,37 +44,35 @@ dependencies {
 
     implementation 'com.github.pircbotx:pircbotx:-SNAPSHOT'
 
-    implementation 'org.apache.commons:commons-text:1.9'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
-    implementation 'org.slf4j:slf4j-api:1.7.32'
+    implementation 'org.apache.commons:commons-text:1.9'
+    
+    implementation 'commons-cli:commons-cli:1.5.0'
     implementation 'commons-codec:commons-codec:1.15'
+    implementation 'commons-net:commons-net:3.8.0'
+  
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.guava:guava:31.0.1-jre'
 
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0'
 
+    implementation 'org.slf4j:slf4j-api:1.7.33'
     implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
     implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
 
-    implementation 'commons-cli:commons-cli:1.5.0'
-    implementation 'commons-net:commons-net:3.8.0'
-
     implementation 'com.rometools:rome:1.18.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
-
     implementation 'net.aksingh:owm-japis:2.5.3.0'
-    implementation 'com.google.code.gson:gson:2.8.9'
-
     implementation 'net.objecthunter:exp4j:0.4.8'
-
-    implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
-    implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
-
     implementation 'org.json:json:20211205'
     implementation 'org.jsoup:jsoup:1.14.3'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
+    implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
+    implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
+
     testImplementation 'com.willowtreeapps.assertk:assertk-jvm:0.25'
 //    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
 //    testImplementation "org.mockito:mockito-core:4.0.0"

From a70f22d40285e252a173bfbfce1804fe139b2f74 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 16 Jan 2022 18:32:28 -0800
Subject: [PATCH 260/262] Changed Modules command to fetch data directly from
 the addons.

---
 src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt        | 2 +-
 .../kotlin/net/thauvin/erik/mobibot/commands/Modules.kt    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index 02467d6..ee6ad12 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -401,6 +401,7 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
         addons.add(Ignore())
         addons.add(LinksMgr())
         addons.add(Me())
+        addons.add(Modules(addons))
         addons.add(Msg())
         addons.add(Nick())
         addons.add(Posting())
@@ -426,7 +427,6 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
         addons.add(Info(tell))
         addons.add(Joke())
         addons.add(Lookup())
-        addons.add(Modules(addons.modulesNames))
         addons.add(Ping())
         addons.add(RockPaperScissors())
         addons.add(StockQuote())
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
index 9ed298c..1ded9ba 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -32,12 +32,13 @@
 
 package net.thauvin.erik.mobibot.commands
 
+import net.thauvin.erik.mobibot.Addons
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.isChannelOp
 import net.thauvin.erik.mobibot.Utils.sendList
 import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Modules(private val modulesNames: List<String>) : AbstractCommand() {
+class Modules(private val addons: Addons) : AbstractCommand() {
     override val name = "modules"
     override val help = listOf("To view a list of enabled modules:", helpFormat("%c $name"))
     override val isOpOnly = true
@@ -46,11 +47,11 @@ class Modules(private val modulesNames: List<String>) : AbstractCommand() {
 
     override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         if (isChannelOp(channel, event)) {
-            if (modulesNames.isEmpty()) {
+            if (addons.modulesNames.isEmpty()) {
                 event.respondPrivateMessage("There are no enabled modules.")
             } else {
                 event.respondPrivateMessage("The enabled modules are: ")
-                event.sendList(modulesNames, 7, isIndent = true)
+                event.sendList(addons.modulesNames, 7, isIndent = true)
             }
         } else {
             helpResponse(channel, args, event)

From 881bd716b0f98a2cea5fb698b8ad2a3ae279ea53 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 18 Jan 2022 10:03:50 -0800
Subject: [PATCH 261/262] Added Names holding object to Addons.

---
 .../kotlin/net/thauvin/erik/mobibot/Addons.kt | 28 +++++++++++--------
 .../net/thauvin/erik/mobibot/Mobibot.kt       |  8 +++---
 .../thauvin/erik/mobibot/commands/Modules.kt  |  7 ++---
 .../net/thauvin/erik/mobibot/AddonsTest.kt    |  6 ++--
 version.properties                            |  6 ++--
 5 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
index 4e95ad0..8ae52a9 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Addons.kt
@@ -48,9 +48,7 @@ class Addons(private val props: Properties) {
 
     val commands: MutableList<AbstractCommand> = mutableListOf()
     val modules: MutableList<AbstractModule> = mutableListOf()
-    val modulesNames: MutableList<String> = mutableListOf()
-    val names: MutableList<String> = mutableListOf()
-    val ops: MutableList<String> = mutableListOf()
+    val names = Names
 
     /**
      * Add a module with properties.
@@ -66,8 +64,8 @@ class Addons(private val props: Properties) {
 
                 if (isEnabled) {
                     modules.add(this)
-                    modulesNames.add(name)
-                    names.addAll(commands)
+                    names.modules.add(name)
+                    names.commands.addAll(commands)
                 }
             }
         }
@@ -88,9 +86,9 @@ class Addons(private val props: Properties) {
                     commands.add(this)
                     if (isVisible) {
                         if (isOpOnly) {
-                            ops.add(name)
+                            names.ops.add(name)
                         } else {
-                            names.add(name)
+                            names.commands.add(name)
                         }
                     }
                 }
@@ -150,11 +148,17 @@ class Addons(private val props: Properties) {
     }
 
     /**
-     * Sort commands and modules names.
+     * Holds commands and modules names.
      */
-    fun sort() {
-        names.sort()
-        ops.sort()
-        modulesNames.sort()
+    object Names {
+        val modules: MutableList<String> = mutableListOf()
+        val commands: MutableList<String> = mutableListOf()
+        val ops: MutableList<String> = mutableListOf()
+
+        fun sort() {
+            modules.sort()
+            commands.sort()
+            ops.sort()
+        }
     }
 }
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
index ee6ad12..d8ff578 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/Mobibot.kt
@@ -143,10 +143,10 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
             ),
         )
         event.sendMessage("The commands are:")
-        event.sendList(addons.names, 8, isBold = true, isIndent = true)
+        event.sendList(addons.names.commands, 8, isBold = true, isIndent = true)
         if (isChannelOp(channel, event)) {
             event.sendMessage("The op commands are:")
-            event.sendList(addons.ops, 8, isBold = true, isIndent = true)
+            event.sendList(addons.names.ops, 8, isBold = true, isIndent = true)
         }
     }
 
@@ -401,7 +401,7 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
         addons.add(Ignore())
         addons.add(LinksMgr())
         addons.add(Me())
-        addons.add(Modules(addons))
+        addons.add(Modules(addons.names.modules))
         addons.add(Msg())
         addons.add(Nick())
         addons.add(Posting())
@@ -435,7 +435,7 @@ class Mobibot(nickname: String, val channel: String, logsDirPath: String, p: Pro
         addons.add(War())
 
         // Sort the addons
-        addons.sort()
+        addons.names.sort()
     }
 }
 
diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
index 1ded9ba..82a0b06 100644
--- a/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
+++ b/src/main/kotlin/net/thauvin/erik/mobibot/commands/Modules.kt
@@ -32,13 +32,12 @@
 
 package net.thauvin.erik.mobibot.commands
 
-import net.thauvin.erik.mobibot.Addons
 import net.thauvin.erik.mobibot.Utils.helpFormat
 import net.thauvin.erik.mobibot.Utils.isChannelOp
 import net.thauvin.erik.mobibot.Utils.sendList
 import org.pircbotx.hooks.types.GenericMessageEvent
 
-class Modules(private val addons: Addons) : AbstractCommand() {
+class Modules(private val modules: List<String>) : AbstractCommand() {
     override val name = "modules"
     override val help = listOf("To view a list of enabled modules:", helpFormat("%c $name"))
     override val isOpOnly = true
@@ -47,11 +46,11 @@ class Modules(private val addons: Addons) : AbstractCommand() {
 
     override fun commandResponse(channel: String, args: String, event: GenericMessageEvent) {
         if (isChannelOp(channel, event)) {
-            if (addons.modulesNames.isEmpty()) {
+            if (modules.isEmpty()) {
                 event.respondPrivateMessage("There are no enabled modules.")
             } else {
                 event.respondPrivateMessage("The enabled modules are: ")
-                event.sendList(addons.modulesNames, 7, isIndent = true)
+                event.sendList(modules, 7, isIndent = true)
             }
         } else {
             helpResponse(channel, args, event)
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
index 54346a9..f03a2c2 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/AddonsTest.kt
@@ -67,7 +67,7 @@ class AddonsTest {
         addons.add(Dice())
         addons.add(Lookup())
         assertThat(addons.modules.size, "modules = 2").isEqualTo(2)
-        assertThat(addons.modulesNames, "module names").containsExactly("Joke", "RockPaperScissors")
+        assertThat(addons.names.modules, "module names").containsExactly("Joke", "RockPaperScissors")
 
         // Commands
         addons.add(View())
@@ -79,9 +79,9 @@ class AddonsTest {
         addons.add(Ignore())
         assertThat(addons.commands.size, "commands = 3").isEqualTo(3)
 
-        assertThat(addons.ops, "ops").containsExactly("cycle")
+        assertThat(addons.names.ops, "ops names").containsExactly("cycle")
 
-        assertThat(addons.names, "names").containsExactly(
+        assertThat(addons.names.commands, "command names").containsExactly(
             "joke",
             "rock",
             "paper",
diff --git a/version.properties b/version.properties
index 4aea8d8..e5629eb 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Sat Jan 08 23:07:31 PST 2022
-version.buildmeta=2440
+#Tue Jan 18 10:02:08 PST 2022
+version.buildmeta=2450
 version.major=0
 version.minor=8
 version.patch=0
 version.prerelease=beta
 version.project=mobibot
-version.semver=0.8.0-beta+2440
+version.semver=0.8.0-beta+2450

From adb7a8c6924f4c4fd31c5c4ebaeaa6d0247388db Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 19 Jan 2022 15:25:07 -0800
Subject: [PATCH 262/262] Updated website docs.

---
 build.gradle       |  2 +-
 version.properties |  8 ++++----
 website/index.html | 21 +++++++++++++--------
 website/simple.css |  3 +--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index fdc6286..96e8940 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,7 +70,7 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.14.3'
     implementation 'org.twitter4j:twitter4j-core:4.0.7'
 
-    implementation 'net.thauvin.erik:cryptoprice:0.9.0-SNAPSHOT'
+    implementation 'net.thauvin.erik:cryptoprice:0.9.0'
     implementation 'net.thauvin.erik:pinboard-poster:1.0.3'
 
     testImplementation 'com.willowtreeapps.assertk:assertk-jvm:0.25'
diff --git a/version.properties b/version.properties
index e5629eb..2f05c8d 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
 #Generated by the Semver Plugin for Gradle
-#Tue Jan 18 10:02:08 PST 2022
-version.buildmeta=2450
+#Wed Jan 19 15:20:26 PST 2022
+version.buildmeta=001
 version.major=0
 version.minor=8
 version.patch=0
-version.prerelease=beta
+version.prerelease=rc
 version.project=mobibot
-version.semver=0.8.0-beta+2450
+version.semver=0.8.0-rc+001
diff --git a/website/index.html b/website/index.html
index fe9468a..6427843 100644
--- a/website/index.html
+++ b/website/index.html
@@ -33,20 +33,19 @@
     <h3>About mobibot</h3>
 
     <p><strong>mobibot</strong> is the
-        <a href="https://www.mobitopia.org/"><strong>#mobitopia</strong></a> IRC channel bot. It is built on Paul Mutton's
-        <a href="http://www.jibble.org/pircbot.php"><strong>PircBot Java-based Framework</strong></a>.</p>
+        <a href="https://www.mobitopia.org/"><strong>#mobitopia</strong></a> IRC channel bot written in <a href="https://kotlinlang.org/"><strong>Kotlin</strong></a>.</p>
 
     <p>mobibot is making extensive use of various <strong>open source libraries</strong>, including:</p>
     <ul>
-        <li><a href="https://commons.apache.org/proper/commons-cli/">Commons CLI</a></li>
-        <li><a href="https://hc.apache.org/httpclient-3.x/">Commons HTTPClient</a></li>
-        <li><a href="https://commons.apache.org/proper/commons-logging/">Commons Logging</a></li>
-        <li><a href="https://commons.apache.org/proper/commons-net/">Commons Net</a></li>
+        <li>Apache Commons <a href="https://commons.apache.org/proper/commons-cli/">CLI</a> and <a href="https://commons.apache.org/proper/commons-net/">Net</a></li>
+        <li><a href="https://github.com/ethauvin/cryptoprice">CryptoPrice</a></li>
         <li><a href="https://www.objecthunter.net/exp4j/">exp4j</a></li>
         <li><a href="https://jsoup.org/">jsoup</a></li>
         <li><a href="https://ostermiller.org/utils/">OstermillerUtils</a></li>
+        <li><a href="https://square.github.io/okhttp/">OkHttp</a></li>
         <li><a href="https://bitbucket.org/aksinghnet/owm-japis">OWM JAPIs</a></li>
         <li><a href="https://github.com/ethauvin/pinboard-poster">Pinboard Poster</a></li>
+        <li><a href="https://github.com/pircbotx/pircbotx">PircBotX</a></li>
         <li><a href="https://rometools.github.io/rome/">Rome</a></li>
         <li><a href="http://twitter4j.org/en/index.html">Twitter4J</a></li>
     </ul>
@@ -58,7 +57,7 @@
 
     <p>mobibot's main functionality is to
         <strong>capture URLs</strong> posted on the channel. The URLs are automatically gathered into a publishable
-        <a href="https://www.mobitopia.org/rss.xml"><strong>RSS feed</strong></a>. </p>
+        <a href="https://www.mobitopia.org/rss.xml"><strong>RSS feed</strong></a> and saved on <a href="https://pinboard.in/t:mobitopia"><strong>Pinboard</strong></a>.</p>
 
     <p>Other features include:</p>
     <ul>
@@ -68,6 +67,10 @@
         <li>Performing calculations
             <div><code>mobibot: calc (floor(sqrt(3)) + 3.14) * 3^2</code></div>
         </li>
+        <li>Crypto currencies prices
+            <div><code>mobibot: cryto btc</code></div>
+            <div><code>mobibot: cryto eth eur</code></div>
+        </li>
         <li>Converting between currencies
             <div><code>mobibot: currency 17.54 USD to EUR</code></div>
         </li>
@@ -102,9 +105,11 @@
         <li>Random jokes from <a href="http://www.icndb.com/">The Internet Chuck Norris Database</a>
             <div><code>mobibot: joke</code></div>
         </li>
-        <li>Rolling dice and playing war
+        <li>Rolling dice or Playing war and rock paper scissors
             <div><code>mobibot: dice</code></div>
             <div><code>mobibot: war</code></div>
+            <div><code>mobibot: paper</code></div>
+            <div><code>mobibot: rock</code></div>
         </li>
         <li>Posting to <a href="https://twitter.com/mobitopia">Twitter</a></li>
     </ul>
diff --git a/website/simple.css b/website/simple.css
index 40178ff..e1204d6 100644
--- a/website/simple.css
+++ b/website/simple.css
@@ -1,7 +1,7 @@
 body {
     background: #ffffff;
     font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
+    font-size: 16px;
     color: #000000;
     margin: 0;
 }
@@ -21,7 +21,6 @@ h3 {
 
 code {
     font-family: Courier New, Courier, mono, monospace;
-    font-size: 12px;
     color: #000066;
     background-color: #ffeedd;
     margin-left: 20px