demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 07:02:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

latest changes before jdk21

Browse Source 
Signed-off-by: Matthew Skinner <matt@pcmus.com>
This commit is contained in:
Matthew Skinner 2025-01-01 20:28:02 +11:00
parent 6978b9978b
commit 089e3bc886
3 changed files with 183 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bundles/org.openhab.binding.telegram/README.md
View File

@ -204,6 +204,9 @@ These actions will send a message to all chat ids configured for this bot.
| sendTelegramPhoto(String photoURL, String caption, String username, String password) | Sends a picture which is downloaded from a username/password protected http/https address. |
| sendTelegramAnimation(String animationURL, String caption) | Send animation files either GIF or H.264/MPEG-4 AVC video without sound. |
| sendTelegramVideo(String videoURL, String caption) | Send MP4 video files up to 50MB. |
| sendKeyboard(Long chatId, String message, String replyId, boolean oneTimeKeyboard, String[]... buttons) | Send a custom keyboard with multiple rows of buttons. |
| sendKeyboard(Long chatId, String message, String replyId, boolean oneTimeKeyboard, String... buttons)| Send a custom keyboard with a single row of buttons. |
| removeKeyboard(boolean isSelective) | Remove a custom keyboard. |
**Note:** In actions that require a file URL, the following formats are acceptable:

2
bundles/org.openhab.binding.telegram/pom.xml
View File

@ -22,7 +22,7 @@
<dependency>
<groupId>com.github.pengrad</groupId>
<artifactId>java-telegram-bot-api</artifactId>
<version>7.1.0</version>
<version>7.11.0</version>
<scope>compile</scope>
</dependency>
<dependency>

180
bundles/org.openhab.binding.telegram/src/main/java/org/openhab/binding/telegram/internal/action/TelegramActions.java
View File

@ -50,6 +50,10 @@ import org.slf4j.LoggerFactory;
import com.pengrad.telegrambot.model.request.InlineKeyboardButton;
import com.pengrad.telegrambot.model.request.InlineKeyboardMarkup;
import com.pengrad.telegrambot.model.request.Keyboard;
import com.pengrad.telegrambot.model.request.KeyboardButton;
import com.pengrad.telegrambot.model.request.ReplyKeyboardMarkup;
import com.pengrad.telegrambot.model.request.ReplyKeyboardRemove;
import com.pengrad.telegrambot.request.AnswerCallbackQuery;
import com.pengrad.telegrambot.request.DeleteMessage;
import com.pengrad.telegrambot.request.EditMessageReplyMarkup;
@ -292,6 +296,180 @@ public class TelegramActions implements ThingActions {
return false;
}
@RuleAction(label = "send a keyboard", description = "Send a Telegram custom keyboard.")
public boolean sendTelegramKeyboard(@ActionInput(name = "chatId") @Nullable Long chatId,
@ActionInput(name = "message") @Nullable String message,
@ActionInput(name = "replyId") @Nullable String replyId,
@ActionInput(name = "oneTimeKeyboard") boolean oneTimeKeyboard,
@ActionInput(name = "buttons") @Nullable String... buttons) {
return sendKeyboard(chatId, message, replyId, oneTimeKeyboard, buttons);
}
@RuleAction(label = "send a keyboard", description = "Send a Telegram custom keyboard.")
public boolean sendTelegramKeyboard(@ActionInput(name = "message") @Nullable String message,
@ActionInput(name = "replyId") @Nullable String replyId,
@ActionInput(name = "oneTimeKeyboard") boolean oneTimeKeyboard,
@ActionInput(name = "buttons") @Nullable String... buttons) {
TelegramHandler localHandler = handler;
if (localHandler != null) {
for (Long chatId : localHandler.getReceiverChatIds()) {
if (!sendTelegramKeyboard(chatId, message, replyId, oneTimeKeyboard, buttons)) {
return false;
}
}
}
return true;
}
private boolean sendReplyMarkup(String replyId, Long chatId, String message, Keyboard keyboard) {
TelegramHandler localHandler = handler;
if (localHandler != null) {
SendMessage sendMessage = new SendMessage(chatId, message);
if (localHandler.getParseMode() != null) {
sendMessage.parseMode(localHandler.getParseMode());
}
if (replyId != null) {
if (!replyId.contains(" ")) {
sendMessage.replyMarkup(keyboard);
}
}
SendResponse retMessage = null;
try {
retMessage = localHandler.execute(sendMessage);
} catch (Exception e) {
logger.warn("Exception occured whilst sending message:{}", e.getMessage());
}
if (!evaluateResponse(retMessage)) {
return false;
}
if (replyId != null && retMessage != null) {
logger.debug("Adding chatId {}, replyId {} and messageId {}", chatId, replyId,
retMessage.message().messageId());
localHandler.addMessageId(chatId, replyId, retMessage.message().messageId());
}
return true;
}
return false;
}
private boolean removeKeyboard(@ActionInput(name = "isSelective") boolean isSelective) {
Keyboard replyKeyboardRemove = new ReplyKeyboardRemove(isSelective);
sendReplyMarkup("324", 34354675676576546L, "foo", replyKeyboardRemove);
return true;
}
private boolean sendKeyboard(@ActionInput(name = "chatId") @Nullable Long chatId, @Nullable String message,
@Nullable String replyId, boolean oneTimeKeyboard, @Nullable String[]... buttons) {
if (message == null) {
logger.warn("Message not defined; action skipped.");
return false;
}
if (chatId == null) {
logger.warn("chatId not defined; action skipped.");
return false;
}
TelegramHandler localHandler = handler;
if (localHandler != null) {
SendMessage sendMessage = new SendMessage(chatId, message);
if (localHandler.getParseMode() != null) {
sendMessage.parseMode(localHandler.getParseMode());
}
if (replyId != null) {
if (!replyId.contains(" ")) {
if (buttons.length > 0) {
KeyboardButton[][] keyboard2D = new KeyboardButton[buttons.length][];
for (int i = 0; i < buttons.length; i++) {
KeyboardButton[] rowOfButtons = new KeyboardButton[buttons[i].length];
for (int x = 0; x < buttons[i].length; x++) {
rowOfButtons[x] = new KeyboardButton(buttons[i][x]);
}
keyboard2D[i] = rowOfButtons;
}
ReplyKeyboardMarkup keyBoardMarkup = new ReplyKeyboardMarkup(keyboard2D);
sendMessage.replyMarkup(keyBoardMarkup);
} else {
logger.warn(
"The replyId {} for message {} is given, but no buttons are defined. ReplyKeyboardMarkup will be ignored.",
replyId, message);
}
} else {
logger.warn("replyId {} must not contain spaces. ReplyKeyboardMarkup will be ignored.", replyId);
}
}
SendResponse retMessage = null;
try {
retMessage = localHandler.execute(sendMessage);
} catch (Exception e) {
logger.warn("Exception occured whilst sending message:{}", e.getMessage());
}
if (!evaluateResponse(retMessage)) {
return false;
}
if (replyId != null && retMessage != null) {
logger.debug("Adding chatId {}, replyId {} and messageId {}", chatId, replyId,
retMessage.message().messageId());
localHandler.addMessageId(chatId, replyId, retMessage.message().messageId());
}
return true;
}
return false;
}
private boolean sendKeyboard(@ActionInput(name = "chatId") @Nullable Long chatId, @Nullable String message,
@Nullable String replyId, boolean oneTimeKeyboard, @Nullable String... buttons) {
if (message == null) {
logger.warn("Message not defined; action skipped.");
return false;
}
if (chatId == null) {
logger.warn("chatId not defined; action skipped.");
return false;
}
TelegramHandler localHandler = handler;
if (localHandler != null) {
SendMessage sendMessage = new SendMessage(chatId, message);
if (localHandler.getParseMode() != null) {
sendMessage.parseMode(localHandler.getParseMode());
}
if (replyId != null) {
if (!replyId.contains(" ")) {
if (buttons.length > 0) {
KeyboardButton[][] keyboard2D = new KeyboardButton[1][];
KeyboardButton[] keyboard = new KeyboardButton[buttons.length];
keyboard2D[0] = keyboard;
for (int i = 0; i < buttons.length; i++) {
keyboard[i] = new KeyboardButton(buttons[i]);
}
ReplyKeyboardMarkup keyBoardMarkup = new ReplyKeyboardMarkup(keyboard2D);
sendMessage.replyMarkup(keyBoardMarkup);
} else {
logger.warn(
"The replyId {} for message {} is given, but no buttons are defined. ReplyKeyboardMarkup will be ignored.",
replyId, message);
}
} else {
logger.warn("replyId {} must not contain spaces. ReplyKeyboardMarkup will be ignored.", replyId);
}
}
SendResponse retMessage = null;
try {
retMessage = localHandler.execute(sendMessage);
} catch (Exception e) {
logger.warn("Exception occured whilst sending message:{}", e.getMessage());
}
if (!evaluateResponse(retMessage)) {
return false;
}
if (replyId != null && retMessage != null) {
logger.debug("Adding chatId {}, replyId {} and messageId {}", chatId, replyId,
retMessage.message().messageId());
localHandler.addMessageId(chatId, replyId, retMessage.message().messageId());
}
return true;
}
return false;
}
@RuleAction(label = "delete a query", description = "Delete a Query using the Telegram API.")
public @ActionOutput(label = "Success", type = "java.lang.Boolean") boolean deleteTelegramQuery(
@ActionInput(name = "replyId") @Nullable String replyId) {
@ -324,7 +502,7 @@ public class TelegramActions implements ThingActions {
}
return true;
} // public boolean deleteTelegramQuery(String replyId)
}
@RuleAction(label = "send a message", description = "Send a Telegram using the Telegram API.")
public @ActionOutput(label = "Success", type = "java.lang.Boolean") boolean sendTelegram(