X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Ftriggers%2FAlwaysTrigger.java;h=b916237657f186c69ec43dc53b1b79f199359895;hb=efb7071d0f1e2b636e70b21bbe187fb2994103f0;hp=b9ec39a50c284584999fdf21f5b274aca4313421;hpb=7df008269091b630ad675801772b72c9bedc55cb;p=rhynodge.git diff --git a/src/main/java/net/pterodactylus/rhynodge/triggers/AlwaysTrigger.java b/src/main/java/net/pterodactylus/rhynodge/triggers/AlwaysTrigger.java index b9ec39a..b916237 100644 --- a/src/main/java/net/pterodactylus/rhynodge/triggers/AlwaysTrigger.java +++ b/src/main/java/net/pterodactylus/rhynodge/triggers/AlwaysTrigger.java @@ -22,6 +22,7 @@ import net.pterodactylus.rhynodge.State; import net.pterodactylus.rhynodge.Trigger; import net.pterodactylus.rhynodge.output.DefaultOutput; import net.pterodactylus.rhynodge.output.Output; +import net.pterodactylus.rhynodge.states.OutputState; /** * {@link Trigger} implementation that always triggers. @@ -58,7 +59,18 @@ public class AlwaysTrigger implements Trigger { */ @Override public Output output(Reaction reaction) { - return new DefaultOutput("true").addText("text/plain", "true").addText("text/html", "
true
"); + DefaultOutput output = new DefaultOutput(reaction.name()); + if (currentState instanceof OutputState) { + OutputState outputState = (OutputState) currentState; + if (outputState.plainTextOutput().isPresent()) { + output = output.addText("text/plain", outputState.plainTextOutput().get()); + } + if (outputState.htmlOutput().isPresent()) { + output = output.addText("text/html", outputState.htmlOutput().get()); + } + return output; + } + return output.addText("text/plain", "true").addText("text/html", "
true
"); } }