Haiti/haiti-framework
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Убрал юнит скрытой отправки, добавив его функционал в простой юнит сохранения

Browse Source 
Разобрался с логикой юнитов с AFTER срабатыванием
This commit is contained in:
Mark Struchkov 2019-05-21 00:20:21 +03:00
parent b4baee35f0
commit 0dfddc7f2d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/sadtech/bot/core/domain/BoxAnswer.java
View File

@ -12,7 +12,7 @@ public class BoxAnswer {
private Float aLong; private Float aLong;
private Integer stickerId; private Integer stickerId;
public BoxAnswer() { private BoxAnswer() {
} }

2
src/main/java/org/sadtech/bot/core/domain/keyboard/KeyBoardLine.java
View File

@ -29,7 +29,7 @@ public class KeyBoardLine {
} }
public Builder setButtonKeyBoard(KeyBoardButton keyBoardButton) { public Builder buttonKeyBoard(KeyBoardButton keyBoardButton) {
KeyBoardLine.this.keyBoardButtons.add(keyBoardButton); KeyBoardLine.this.keyBoardButtons.add(keyBoardButton);
return this; return this;
} }

6
src/main/java/org/sadtech/bot/core/service/KeyBoards.java
View File

@ -16,7 +16,7 @@ public class KeyBoards {
public static KeyBoard keyBoardYesNo() { public static KeyBoard keyBoardYesNo() {
KeyBoardButton yesButton = KeyBoardButton.builder().color(ButtonColor.POSITIVE).label("Да").payload("{\"button\": \"yes\"}").build(); KeyBoardButton yesButton = KeyBoardButton.builder().color(ButtonColor.POSITIVE).label("Да").payload("{\"button\": \"yes\"}").build();
KeyBoardButton noButton = KeyBoardButton.builder().color(ButtonColor.NEGATIVE).label("Нет").payload("{\"button\": \"no\"}").build(); KeyBoardButton noButton = KeyBoardButton.builder().color(ButtonColor.NEGATIVE).label("Нет").payload("{\"button\": \"no\"}").build();
KeyBoardLine keyBoardLine = KeyBoardLine.builder().setButtonKeyBoard(yesButton).setButtonKeyBoard(noButton).build(); KeyBoardLine keyBoardLine = KeyBoardLine.builder().buttonKeyBoard(yesButton).buttonKeyBoard(noButton).build();
return KeyBoard.builder().lineKeyBoard(keyBoardLine).oneTime(true).build(); return KeyBoard.builder().lineKeyBoard(keyBoardLine).oneTime(true).build();
} }
@ -24,7 +24,7 @@ public class KeyBoards {
KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true); KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true);
for (String labelButton : labelButtons) { for (String labelButton : labelButtons) {
KeyBoardButton keyBoardButton = KeyBoardButton.builder().label(labelButton).payload("{\"button\": \"" + labelButton + "\"}").build(); KeyBoardButton keyBoardButton = KeyBoardButton.builder().label(labelButton).payload("{\"button\": \"" + labelButton + "\"}").build();
keyBoard.lineKeyBoard(KeyBoardLine.builder().setButtonKeyBoard(keyBoardButton).build()); keyBoard.lineKeyBoard(KeyBoardLine.builder().buttonKeyBoard(keyBoardButton).build());
} }
return keyBoard.build(); return keyBoard.build();
} }
@ -32,7 +32,7 @@ public class KeyBoards {
public static KeyBoard verticalMenuButton(List<KeyBoardButton> keyBoardButtons) { public static KeyBoard verticalMenuButton(List<KeyBoardButton> keyBoardButtons) {
KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true); KeyBoard.Builder keyBoard = KeyBoard.builder().oneTime(true);
for (KeyBoardButton keyBoardButton : keyBoardButtons) { for (KeyBoardButton keyBoardButton : keyBoardButtons) {
keyBoard.lineKeyBoard(KeyBoardLine.builder().setButtonKeyBoard(keyBoardButton).build()); keyBoard.lineKeyBoard(KeyBoardLine.builder().buttonKeyBoard(keyBoardButton).build());
} }
return keyBoard.build(); return keyBoard.build();
} }