Merge branch 'release/v5.1.3'

Valandur · Jun 19, 2018 · a175727 · a175727
2 parents 00d34d8 + 12ac7e3
commit a175727
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 32 deletions.
diff --git a/docs/MESSAGE.md b/docs/MESSAGE.md
@@ -58,7 +58,7 @@ in the text.
 ## Responses
 
 To receive the responses (when players click one of the provided options) you must add a
-[WebHook](WEBHOOKS.md) for **CUSTOM_MESSAGE**.
+[WebHook](WEBHOOKS.md) for **INTERACTIVE_MESSAGE**. (previously CUSTOM_MESSAGE)
 
 The response will look similar to the following:
 ```json

diff --git a/docs/WEBHOOKS.md b/docs/WEBHOOKS.md
@@ -145,14 +145,14 @@ as to when that event is triggered.
 | Event / Hook name   | Description |
 | ------------------- | ----------- |
 | ALL                 | Fired for all events listed below
-| CUSTOM_MESSAGE      | Use this hook to capture the response from [Messages](MESSAGE.md)
 | ACHIEVEMENT         | Fired when a player earns a new achievement
 | BLOCK_UPDATE_STATUS | Fired when a Web-API BlockUpdate changes status
 | CHAT                | Fired when a chat message is sent (by players)
 | COMMAND             | Fired when a command is executed
 | GENERATE_CHUNK      | Fired when a new chunk is generated
 | EXPLOSION           | Fired when an explosion happens
 | INTERACT_BLOCK      | Fired when a player interacts with a block
+| INTERACTIVE_MESSAGE | Use this hook to capture the response from [Messages](MESSAGE.md) (prev CUSTOM_MESSAGE)
 | INVENTORY_OPEN      | Fired when a player opens an inventory
 | INVENTORY_CLOSE     | Fired when a player closes an inventory
 | PLAYER_JOIN         | Fired when a player joins the server

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.1.2
+version=5.1.3
 minecraftVersion=1.12.2
 spongeVersion=7.1
 jacksonVersion=2.9.4

diff --git a/src/main/java/valandur/webapi/message/InteractiveMessage.java b/src/main/java/valandur/webapi/message/InteractiveMessage.java
@@ -94,7 +94,10 @@ public Boolean isOnce() {
     @ApiModelProperty("Clickable options that the player can select from")
     @JsonDetails
     public List<InteractiveMessageOption> getOptions() {
-        return new ArrayList<>(options);
+        if (options != null) {
+            return new ArrayList<>(options);
+        }
+        return new ArrayList<>();
     }
 
     /**

diff --git a/src/main/java/valandur/webapi/util/JettyLogger.java b/src/main/java/valandur/webapi/util/JettyLogger.java
@@ -5,10 +5,11 @@
 
 public class JettyLogger implements Logger {
     private org.slf4j.Logger logger;
-    private boolean enableDebug = true;
+    private boolean enableDebug;
 
     public JettyLogger() {
         logger = WebAPI.getLogger();
+        enableDebug = WebAPI.isDevMode();
     }
 
     @Override public String getName() { return "jetty"; }

diff --git a/webapi.iml b/webapi.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="webapi" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="valandur.webapi" external.system.module.version="5.1.2-S7.1" relativePaths="true" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="webapi" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="valandur.webapi" external.system.module.version="5.1.3-S7.1" relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

diff --git a/webapi_main.iml b/webapi_main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="webapi:main" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="valandur.webapi" external.system.module.type="sourceSet" external.system.module.version="5.1.2-S7.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="webapi:main" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="valandur.webapi" external.system.module.type="sourceSet" external.system.module.version="5.1.3-S7.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="minecraft" name="Minecraft">
       <configuration>
@@ -20,6 +20,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: co.aikar:minecraft-timings:1.0.4" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.9.4" level="project" />
+    <orderEntry type="library" name="Gradle: io.sentry:sentry:1.6.4" level="project" />
     <orderEntry type="module-library" scope="RUNTIME">
       <library>
         <CLASSES>
@@ -29,7 +30,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="Gradle: io.sentry:sentry:1.6.4" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.9.4" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.4" level="project" />
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.9.4" level="project" />
@@ -86,31 +86,31 @@
     <orderEntry type="library" name="Gradle: org.glassfish.hk2:hk2-api:2.5.0-b42" level="project" />
     <orderEntry type="library" name="Gradle: org.jvnet.mimepull:mimepull:1.9.6" level="project" />
     <orderEntry type="library" name="Gradle: org.eclipse.jetty:jetty-util:9.4.8.v20171121" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: ninja.leaping.configurate:configurate-core:3.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: :UniversalMarket-1.12.2-v1.1:" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.inject:guice:4.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: :WebBooks:" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.ben-manes.caffeine:caffeine:2.5.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.ben-manes.caffeine:guava:2.5.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.spongepowered:plugin-meta:0.4.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: ninja.leaping.configurate:configurate-gson:3.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.flowpowered:flow-math:1.0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.flowpowered:flow-noise:1.0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.ow2.asm:asm:5.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.typesafe:config:1.3.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: :MMCRestrict-1.4.2-API-7:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: :UniversalMarket-1.12.2-v1.1:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: :RedProtect-7.3.0-b68-Universal:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: :HuskyCrates-v1.8.0PRE2-API7:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: :Nucleus-1.3.3-S7.0-api:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: :CmdScheduler-s7.1-v1.1.0:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: :MMCTickets-1.4.1-API-7:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.spongepowered:spongeapi:7.1.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: ninja.leaping.configurate:configurate-yaml:3.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: ninja.leaping.configurate:configurate-hocon:3.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: :MMCRestrict-1.4.2-API-7:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.typesafe:config:1.3.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: aopalliance:aopalliance:1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.ow2.asm:asm:5.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.flowpowered:flow-noise:1.0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.flowpowered:flow-math:1.0.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Gradle: :ActiveTime-s7.1-v1.4.0:" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: ninja.leaping.configurate:configurate-yaml:3.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.spongepowered:spongeapi:7.1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: :MMCTickets-1.4.1-API-7:" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: :CmdScheduler-s7.1-v1.1.0:" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: :Nucleus-1.3.3-S7.0-api:" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: :HuskyCrates-v1.8.0PRE2-API7:" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Gradle: :RedProtect-7.3.0-b68-Universal:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: ninja.leaping.configurate:configurate-gson:3.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: org.spongepowered:plugin-meta:0.4.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.ben-manes.caffeine:guava:2.5.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.github.ben-manes.caffeine:caffeine:2.5.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: :WebBooks:" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: ninja.leaping.configurate:configurate-core:3.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.inject:guice:4.1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle: com.google.code.findbugs:jsr305:3.0.1" level="project" />
   </component>
 </module>
diff --git a/webapi_test.iml b/webapi_test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="webapi:test" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="valandur.webapi" external.system.module.type="sourceSet" external.system.module.version="5.1.2-S7.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="webapi:test" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="valandur.webapi" external.system.module.type="sourceSet" external.system.module.version="5.1.3-S7.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="minecraft" name="Minecraft">
       <configuration />