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

Cleaned up msg.

Browse source
This commit is contained in:
Erik C. Thauvin 2020-06-13 03:27:50 -07:00
parent d843c65f6f
commit d6a85ef4af
21 changed files with 68 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/mobibot.iml generated
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">

10
.idea/modules/mobibot.main.iml generated
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-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-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"> <component name="FacetManager">
<facet type="kotlin-language" name="Kotlin"> <facet type="kotlin-language" name="Kotlin">
<configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false"> <configuration version="3" platform="JVM 9" allPlatforms="JVM [9]" useProjectSettings="false">
@ -8,7 +8,7 @@
</compilerSettings> </compilerSettings>
<compilerArguments> <compilerArguments>
<option name="destination" value="$MODULE_DIR$/../../build/classes/kotlin/main" /> <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="noStdlib" value="true" />
<option name="noReflect" value="true" /> <option name="noReflect" value="true" />
<option name="moduleName" value="mobibot" /> <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" 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" 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: 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-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-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.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.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.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.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.json:json:20200518" level="project" />
<orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.13.1" 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: 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: 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.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.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.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.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:annotations:13.0" level="project" />

10
.idea/modules/mobibot.test.iml generated
View file

File diff suppressed because one or more lines are too long

8
src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
View file

@ -14,13 +14,13 @@ import java.time.*;
public final class ReleaseInfo { public final class ReleaseInfo {
public static final String PROJECT = "mobibot"; public static final String PROJECT = "mobibot";
public static final LocalDateTime BUILDDATE = 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 MAJOR = 0;
public static final int MINOR = 8; public static final int MINOR = 8;
public static final int PATCH = 0; public static final int PATCH = 0;
public static final String PRERELEASE = "alpha"; public static final String PRERELEASE = "beta";
public static final String BUILDMETA = "370"; public static final String BUILDMETA = "004";
public static final String VERSION = "0.8.0-alpha+370"; public static final String VERSION = "0.8.0-beta+004";
/** /**
* Disables the default constructor. * Disables the default constructor.

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

@ -850,7 +850,7 @@ public class Mobibot extends PircBot {
* @param message The message. * @param message The message.
*/ */
public final void send(final String who, final Message 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());
} }
/** /**

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

@ -101,7 +101,7 @@ public final class Joke extends ThreadedModule {
@Override @Override
void run(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 { try {
bot.send(Utils.cyan(randomJoke().getText())); bot.send(Utils.cyan(randomJoke().getMsg()));
} catch (ModuleException e) { } catch (ModuleException e) {
bot.getLogger().warn(e.getDebugMessage(), e); bot.getLogger().warn(e.getDebugMessage(), e);
bot.send(sender, e.getMessage(), isPrivate); bot.send(sender, e.getMessage(), isPrivate);

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

@ -258,7 +258,7 @@ public final class Twitter extends ThreadedModule {
void run(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 { try {
bot.send(sender, bot.send(sender,
post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getText(), post(sender, message + " (by " + sender + " on " + bot.getChannel() + ')', false).getMsg(),
isPrivate); isPrivate);
} catch (ModuleException e) { } catch (ModuleException e) {
bot.getLogger().warn(e.getDebugMessage(), e); bot.getLogger().warn(e.getDebugMessage(), e);

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

@ -226,12 +226,12 @@ public final class WorldTime extends AbstractModule {
} else { } else {
final Message msg = worldTime(args); final Message msg = worldTime(args);
if (isPrivate) { if (isPrivate) {
bot.send(sender, msg.getText(), true); bot.send(sender, msg.getMsg(), true);
} else { } else {
if (msg.isError()) { if (msg.isError()) {
bot.send(sender, msg.getText(), false); bot.send(sender, msg.getMsg(), false);
} else { } else {
bot.send(msg.getText()); bot.send(msg.getMsg());
} }
} }
} }

28
src/main/java/net/thauvin/erik/mobibot/msg/ErrorMessage.kt
View file

@ -38,29 +38,11 @@ package net.thauvin.erik.mobibot.msg
* @created 2019-04-07 * @created 2019-04-07
* @since 1.0 * @since 1.0
*/ */
class ErrorMessage : Message { class ErrorMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
/** init {
* Creates a new error message. this.msg = msg
*
* @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
this.color = color this.color = color
isError = true
isNotice = true
} }
} }

48
src/main/java/net/thauvin/erik/mobibot/msg/Message.kt
View file

@ -41,8 +41,12 @@ import org.jibble.pircbot.Colors
* @since 1.0 * @since 1.0
*/ */
open class Message { open class Message {
companion object {
var DEFAULT_COLOR = Colors.NORMAL
}
/** Color */ /** Color */
var color = Colors.NORMAL var color = DEFAULT_COLOR
/** Error */ /** Error */
var isError = false var isError = false
@ -54,7 +58,7 @@ open class Message {
var isPrivate = false var isPrivate = false
/** Message text*/ /** Message text*/
var text = "" var msg = ""
/** Creates a new message. */ /** Creates a new message. */
constructor() { constructor() {
@ -64,42 +68,18 @@ open class Message {
/** /**
* Creates a new message. * Creates a new message.
* *
* @param text The message. * @param msg 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. * @param color The color.
* @param isNotice The notice flag.
* @param isError The error flag.
* @param isPrivate The private flag.
*/ */
constructor( @JvmOverloads
text: String, constructor(msg: String, color: String = DEFAULT_COLOR, isNotice: Boolean, isError: Boolean, isPrivate: Boolean) {
isNotice: Boolean, this.msg = msg
isError: Boolean, this.color = color
isPrivate: Boolean,
color: String
) {
this.text = text
this.isNotice = isNotice this.isNotice = isNotice
this.isError = isError this.isError = isError
this.isPrivate = isPrivate this.isPrivate = isPrivate
this.color = color
}
override fun toString(): String {
return "Message(color='$color', isError=$isError, isNotice=$isNotice, isPrivate=$isPrivate, message='$text')"
} }
} }

24
src/main/java/net/thauvin/erik/mobibot/msg/NoticeMessage.kt
View file

@ -38,26 +38,10 @@ package net.thauvin.erik.mobibot.msg
* @created 2019-04-07 * @created 2019-04-07
* @since 1.0 * @since 1.0
*/ */
class NoticeMessage : Message { class NoticeMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
/** init {
* Creates a new notice. this.msg = msg
*
* @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
this.color = color this.color = color
isNotice = true
} }
} }

22
src/main/java/net/thauvin/erik/mobibot/msg/PrivateMessage.kt
View file

@ -39,25 +39,9 @@ package net.thauvin.erik.mobibot.msg
* @since 1.0 * @since 1.0
*/ */
@Suppress("unused") @Suppress("unused")
class PrivateMessage : Message { class PrivateMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
/** init {
* Creates a new private message. this.msg = msg
*
* @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
this.color = color this.color = color
isPrivate = true isPrivate = true
} }

22
src/main/java/net/thauvin/erik/mobibot/msg/PublicMessage.kt
View file

@ -38,25 +38,9 @@ package net.thauvin.erik.mobibot.msg
* @created 2019-04-07 * @created 2019-04-07
* @since 1.0 * @since 1.0
*/ */
class PublicMessage : Message { class PublicMessage @JvmOverloads constructor(msg: String, color: String = DEFAULT_COLOR) : Message() {
/** init {
* Creates a new public message. this.msg = msg
*
* @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
this.color = color this.color = color
} }
} }

6
src/test/java/net/thauvin/erik/mobibot/modules/CurrencyConverterTest.java
View file

@ -54,11 +54,11 @@ public class CurrencyConverterTest {
@Test @Test
@SuppressFBWarnings("PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS") @SuppressFBWarnings("PRMC_POSSIBLY_REDUNDANT_METHOD_CALLS")
public void testConvertCurrency() { 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"); .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?"); .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."); .as("100 USD").contains("Invalid query.");
assertThat(CurrencyConverter.currencyRates().size()) assertThat(CurrencyConverter.currencyRates().size())
.as("currencyRates().size() == 33").isEqualTo(33); .as("currencyRates().size() == 33").isEqualTo(33);

4
src/test/java/net/thauvin/erik/mobibot/modules/GoogleSearchTest.java
View file

@ -63,11 +63,11 @@ public class GoogleSearchTest extends LocalProperties {
try { try {
List<Message> messages = GoogleSearch.searchGoogle("mobibot site:github.com", apiKey, cseKey); List<Message> messages = GoogleSearch.searchGoogle("mobibot site:github.com", apiKey, cseKey);
assertThat(messages).as("mobibot results not empty").isNotEmpty(); 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); messages = GoogleSearch.searchGoogle("aapl", apiKey, cseKey);
assertThat(messages).as("aapl results not empty").isNotEmpty(); 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( assertThatThrownBy(() -> GoogleSearch.searchGoogle("test", "", "apiKey")).as("no API key").isInstanceOf(
ModuleException.class).hasNoCause(); ModuleException.class).hasNoCause();

4
src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java
View file

@ -51,7 +51,7 @@ public class JokeTest {
@Test @Test
public void testRamdomJoke() throws ModuleException { public void testRamdomJoke() throws ModuleException {
assertThat(Joke.randomJoke().getText().length() > 0).as("randomJoke() > 0").isTrue(); assertThat(Joke.randomJoke().getMsg().length() > 0).as("randomJoke() > 0").isTrue();
assertThat(Joke.randomJoke().getText()).as("randomJoke()").containsIgnoringCase("chuck"); assertThat(Joke.randomJoke().getMsg()).as("randomJoke()").containsIgnoringCase("chuck");
} }
} }

2
src/test/java/net/thauvin/erik/mobibot/modules/StockQuoteTest.java
View file

@ -58,7 +58,7 @@ public class StockQuoteTest extends LocalProperties {
try { try {
final List<Message> messages = StockQuote.getQuote("apple inc", apiKey); final List<Message> messages = StockQuote.getQuote("apple inc", apiKey);
assertThat(messages).as("response not empty").isNotEmpty(); 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 { try {
StockQuote.getQuote("blahfoo", apiKey); StockQuote.getQuote("blahfoo", apiKey);

2
src/test/java/net/thauvin/erik/mobibot/modules/TwitterTest.java
View file

@ -73,6 +73,6 @@ public class TwitterTest extends LocalProperties {
getProperty(Twitter.TOKEN_SECRET_PROP), getProperty(Twitter.TOKEN_SECRET_PROP),
getProperty(Twitter.HANDLE_PROP), getProperty(Twitter.HANDLE_PROP),
msg, msg,
true).getText()).as("twitterPost(" + msg + ')').isEqualTo(msg); true).getMsg()).as("twitterPost(" + msg + ')').isEqualTo(msg);
} }
} }

8
src/test/java/net/thauvin/erik/mobibot/modules/Weather2Test.java
View file

@ -54,12 +54,12 @@ public class Weather2Test extends LocalProperties {
@Test @Test
public void testWeather() throws ModuleException { public void testWeather() throws ModuleException {
List<Message> messages = Weather2.getWeather("98204", 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(0).getMsg()).as("is Everett").contains("Everett").contains("US");
assertThat(messages.get(messages.size() - 1).getText()).as("is City Search").endsWith("98204%2CUS"); 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)); 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(0).getMsg()).as("is UK").contains("London").contains("UK");
assertThat(messages.get(messages.size() - 1).getText()).as("is City Code").endsWith("4517009"); assertThat(messages.get(messages.size() - 1).getMsg()).as("is City Code").endsWith("4517009");
assertThatThrownBy(() -> Weather2.getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP))) assertThatThrownBy(() -> Weather2.getWeather("Montpellier, FR", getProperty(Weather2.OWM_API_KEY_PROP)))
.as("Montpellier not found").hasCauseInstanceOf(APIException.class); .as("Montpellier not found").hasCauseInstanceOf(APIException.class);

4
src/test/java/net/thauvin/erik/mobibot/modules/WordTimeTest.java
View file

@ -47,9 +47,9 @@ import static org.assertj.core.api.Assertions.assertThat;
public class WordTimeTest { public class WordTimeTest {
@Test @Test
public void testWorldTime() { 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("BLAH").isError()).as("BLAH").isTrue();
assertThat(WorldTime.worldTime("BEATS").getText()).as("BEATS").contains("@"); assertThat(WorldTime.worldTime("BEATS").getMsg()).as("BEATS").contains("@");
} }
@Test @Test

6
version.properties
View file

@ -1,9 +1,9 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Sat Jun 13 02:01:11 PDT 2020 #Sat Jun 13 03:10:34 PDT 2020
version.buildmeta=001 version.buildmeta=004
version.major=0 version.major=0
version.minor=8 version.minor=8
version.patch=0 version.patch=0
version.prerelease=beta version.prerelease=beta
version.project=mobibot version.project=mobibot
version.semver=0.8.0-beta+001 version.semver=0.8.0-beta+004