Custom parameter layout (twonirwana#179)

* wip

* wip

* readme

README.adoc

@@ -69,7 +69,7 @@ Some example for commands, many more systems can be mapped, please see in the de
 [discrete]
 === Savage Worlds:
 
-`/custom_parameter start expression: (d!!{side:4/6/8/12/20} + {Hero: 0/1d!!6})k1`
+`/custom_parameter start expression: (d!!{Dice:4@D4/6@D6/8@D8/12@D12/20@D20} + {Type: 0@Regular/1d!!6@Wildcard})k1`
 
 [discrete]
 === Traveller
@@ -111,7 +111,8 @@ image:image/full.png[image]
 
 ==== Without expression
 
-`without_expression` is the same as `full` but don't show the dice expression in the result. This is useful if the expression is very long and it is recommended to add a label.
+`without_expression` is the same as `full` but don't show the dice expression in the result.
+This is useful if the expression is very long and it is recommended to add a label.
 
 image:image/without_expression.png[image]
 
@@ -269,20 +270,23 @@ The old version of the command, with the old dice expression, can be still used
 
 image:image/custom_parameter.webp[image]
 
-Use for example the slash command `/custom_parameter expression:{numberOfDice:1<=>10}d{sides:4/6/8/10/12/20/100}` to create a message with a dice expression, where the user can fill the parameter with buttons.
+Use for example the slash command `/custom_parameter expression:{numberOfDice:1\<\=>10}d{sides:4@D4/6@D6/8@D8/12@D12/20@D20}` to create a message with a dice expression, where the user can fill the parameter with buttons.
 For the dice expression see the section <<Dice Expression Notation>>.
 The parameter have the format `+{name}+`.
 If there is no range given, then button for the values 1-15 are presented.
 There are two parameter range notations:
 
-* `{numberOfDice:1<=>10}`: Provides the buttons for the given range (including).
+* `{numberOfDice:1\<\=>10}`: Provides the buttons for the given range (including).
 The maximum are 23 buttons.
-* `{sides:4/6/8/10/12/20/100}`: Provides each value, seperated be a slash up to 23 buttons.
+* `{sides:4/6/8/10/12/20}`: Provides each value, seperated be a slash up to 23 buttons.
+It is possible to add an optional label to each value in the format `value@label`.
+For example `{bonus:0@None/3@Small Bonus/5@Big Bonus}` will show on the buttons 'None', 'Small Bonus' and 'Big Bonus' but apply the values 0, 3 or 5 to the expression
 
 The user can click on the buttons to fill all open parameter of the expression.
 If all parameter are selected then the expression will be rolled.
 The first user that clicks on a button add his name to the message and only this user can select further parameter.
 Every user can still use the `Clear` button.
+The command uses the `without_expression` as default answer format.
 
 === Clear Command
 

bot/src/main/java/de/janno/discord/bot/Bot.java

@@ -20,7 +20,7 @@ public static void main(final String[] args) throws Exception {
         final String token = args[0];
         final boolean disableCommandUpdate = Boolean.parseBoolean(args[1]);
         final String publishMetricsToUrl = args[2];
-        BotMetrics.init(publishMetricsToUrl);
+        BotMetrics.init(publishMetricsToUrl, 8080);
 
         final String h2Url;
         if (args.length >= 4) {

bot/src/main/java/de/janno/discord/bot/BotMetrics.java

@@ -44,7 +44,7 @@ public class BotMetrics {
     private static final String ANSWER_TIMER_PREFIX = "answerTimer";
     private static final String NEW_BUTTON_TIMER_PREFIX = "newButtonTimer";
 
-    public static void init(String publishMetricsToUrl) {
+    public static void init(String publishMetricsToUrl, int port) {
         if (!Strings.isNullOrEmpty(publishMetricsToUrl)) {
             PrometheusMeterRegistry prometheusRegistry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT);
             Metrics.addRegistry(prometheusRegistry);
@@ -55,7 +55,7 @@ public static void init(String publishMetricsToUrl) {
                 exchange.getResponseSender().send(prometheusRegistry.scrape());
             });
             Undertow server = Undertow.builder()
-                    .addHttpListener(8080, publishMetricsToUrl)
+                    .addHttpListener(port, publishMetricsToUrl)
                     .setHandler(handler).build();
             server.start();
 

bot/src/main/java/de/janno/discord/bot/command/AbstractCommand.java

@@ -88,7 +88,11 @@ protected Optional<Long> getAnswerTargetChannelIdFromStartCommandOption(@NonNull
     protected AnswerFormatType getAnswerTypeFromStartCommandOption(@NonNull CommandInteractionOption options) {
         return options.getStringSubOptionWithName(ANSWER_FORMAT_OPTION)
                 .map(AnswerFormatType::valueOf)
-                .orElse(AnswerFormatType.full);
+                .orElse(defaultAnswerFormat());
+    }
+
+    protected AnswerFormatType defaultAnswerFormat(){
+        return AnswerFormatType.full;
     }
 
     @Override

bot/src/main/java/de/janno/discord/bot/command/State.java

@@ -11,6 +11,8 @@ public class State<T extends StateData> {
 
     @NonNull
     String buttonValue;
+
+    //todo optional getter
     @Nullable
     T data;