GamingServerGeraet
/
TelegramAPI
5
1
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

fixed problem, with MessageBuilder and media events

This commit is contained in:
mrbesen 2021-01-21 21:13:59 +01:00
parent 014e58a45b
commit 64016a859c
Signed by: MrBesen
GPG Key ID: 596B2350DCD67504
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/mrbesen/telegram/MessageBuilder.java
View File

@ -233,8 +233,8 @@ public class MessageBuilder {
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
class SendableMessage { class SendableMessage {
private final String q;
private final String command; private final String command;
private final String q;
private final long userid; private final long userid;
} }

61
src/main/java/de/mrbesen/telegram/TelegramAPI.java
View File

@ -572,7 +572,7 @@ public class TelegramAPI implements Runnable {
String text = msg.getText(); String text = msg.getText();
if(text != null) { if(text != null) {
if(text.matches("^\\/(\\w*)(@(\\w*))?")) { if(text.matches("^\\/(\\w*)(@(\\w*))?")) { //is a command
text = text.substring(1);//remove '/' text = text.substring(1);//remove '/'
isCommand = true; isCommand = true;
if(text.contains("@")) {//check name if(text.contains("@")) {//check name
@ -589,39 +589,42 @@ public class TelegramAPI implements Runnable {
cmdmgr.onCommand(text, msg.getFrom(), msg); cmdmgr.onCommand(text, msg.getFrom(), msg);
} }
} else { } else {
Event e = null; Event e = new UserSendMessageEvent(msg);
if(msg.has(Member.audio)) { //call feedback cmd first
e = new UserSendAudioEvent(msg); if(!disableFeedback) {
} else if(msg.has(Member.video)) { if (feedbackCmd.onMsg((UserSendMessageEvent) e)) {
e = null;
} else if(msg.has(Member.document)) {
e = new UserSendDocumentEvent(msg);
} else if(msg.has(Member.photo)) {
e = new UserSendPhotoEvent(msg);
} else if(msg.has(Member.invoice)) {
} else if(msg.has(Member.location)) {
} else if(msg.has(Member.video_note)) {
} else if(msg.has(Member.game)) {
} else if(msg.has(Member.contact)) {
} else if(msg.has(Member.sticker)) {
} else {
e = new UserSendMessageEvent(msg);
//call feedback cmd first
if(!disableFeedback) {
if (feedbackCmd.onMsg((UserSendMessageEvent) e)) {
e = null;
}
} }
} }
getEventManager().callEvent(e); getEventManager().callEvent(e);
return; //do not process other events
} }
} }
Event e = null;
//process media events
if(msg.has(Member.audio)) {
e = new UserSendAudioEvent(msg);
} else if(msg.has(Member.video)) {
//TODO
} else if(msg.has(Member.document)) {
e = new UserSendDocumentEvent(msg);
} else if(msg.has(Member.photo)) {
e = new UserSendPhotoEvent(msg);
} else if(msg.has(Member.invoice)) {
//TODO
} else if(msg.has(Member.location)) {
//TODO
} else if(msg.has(Member.video_note)) {
//TODO
} else if(msg.has(Member.game)) {
//TODO
} else if(msg.has(Member.contact)) {
//TODO
} else if(msg.has(Member.sticker)) {
//TODO
}
getEventManager().callEvent(e);
} else if(json.has("callback_query")) { } else if(json.has("callback_query")) {
JSONObject cbq = json.getJSONObject("callback_query"); JSONObject cbq = json.getJSONObject("callback_query");
TUser from = api.getUser(cbq.getJSONObject("from")); TUser from = api.getUser(cbq.getJSONObject("from"));