From ae844ad2cd20e598437c211f96c9fb37f1dc8dba Mon Sep 17 00:00:00 2001
From: Thies <thiesyy@github.com>
Date: Thu, 19 Jul 2018 12:23:26 +0200
Subject: [PATCH] Removed grammar failure, added "sendTypedMessage" function to
 de.mrbesen.telegram.TelegramAPI.sendTypedMessage

---
 src/de/mrbesen/telegram/TelegramAPI.java       | 18 +++++++++++++++++-
 src/de/mrbesen/telegram/objects/JSONBased.java |  4 ++--
 src/de/mrbesen/telegram/objects/TSendable.java |  2 +-
 src/de/mrbesen/test/Main.java                  | 13 ++++++++++---
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/de/mrbesen/telegram/TelegramAPI.java b/src/de/mrbesen/telegram/TelegramAPI.java
index 5b1923f..01eea9c 100644
--- a/src/de/mrbesen/telegram/TelegramAPI.java
+++ b/src/de/mrbesen/telegram/TelegramAPI.java
@@ -7,6 +7,7 @@ import java.util.LinkedList;
 import java.util.Scanner;
 
 import javax.net.ssl.HttpsURLConnection;
+import javax.print.attribute.SetOfIntegerSyntax;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -18,6 +19,7 @@ import de.mrbesen.telegram.event.EventManager;
 import de.mrbesen.telegram.event.events.UserSendAudioEvent;
 import de.mrbesen.telegram.event.events.UserSendMessageEvent;
 import de.mrbesen.telegram.objects.JSONBased.Member;
+import de.mrbesen.telegram.objects.TUser.Status;
 import de.mrbesen.telegram.objects.TAudio;
 import de.mrbesen.telegram.objects.TMessage;
 import de.mrbesen.telegram.objects.TUser;
@@ -53,7 +55,7 @@ public class TelegramAPI implements Runnable {
 			thread.start();
 		} else {
 			throw new IllegalStateException("Still Running.");
-		}
+		} 
 	}
 
 	public JSONObject request(String request, String parameter) throws IOException {
@@ -89,6 +91,20 @@ public class TelegramAPI implements Runnable {
 		}
 		return null;
 	}
+	public void sendTypedMessage(final String msg, final TUser user, final int seconds) {
+	new Thread(new Runnable() {
+		@Override
+		public void run() {
+			user.sendStatus(Status.Typing);
+			try {
+				Thread.sleep(seconds*1000);
+			} catch (InterruptedException e) {
+			}
+		sendMessage(new MessageBuilder().setText(msg).setReciver(user.getID()).build());
+	
+		}
+	}).start();	
+	}
 	
 	public void stop() {
 		run = false;
diff --git a/src/de/mrbesen/telegram/objects/JSONBased.java b/src/de/mrbesen/telegram/objects/JSONBased.java
index d6ce046..72c9879 100644
--- a/src/de/mrbesen/telegram/objects/JSONBased.java
+++ b/src/de/mrbesen/telegram/objects/JSONBased.java
@@ -16,7 +16,7 @@ public class JSONBased {
 	public boolean has(Member mem) {
 		if(base_json == null)
 			return false;
-		if(!isAllowd(mem))
+		if(!isAllowed(mem))
 			throw new UnallowedMemberException(mem, this);
 		return base_json.has(mem.name());
 	}
@@ -27,7 +27,7 @@ public class JSONBased {
 		return base_json.get(mem.name());
 	}
 	
-	public boolean isAllowd(Member mem) {
+	public boolean isAllowed(Member mem) {
 		for(Member allowedmem : allowedmembers) {
 			if(allowedmem == mem) {
 				return true;
diff --git a/src/de/mrbesen/telegram/objects/TSendable.java b/src/de/mrbesen/telegram/objects/TSendable.java
index f65ec69..6011aff 100644
--- a/src/de/mrbesen/telegram/objects/TSendable.java
+++ b/src/de/mrbesen/telegram/objects/TSendable.java
@@ -7,7 +7,7 @@ public class TSendable extends JSONBased {
 	protected String file_id;
 	
 	public void set(Member mem, Object value ) {
-		if(isAllowd(mem)) {
+		if(isAllowed(mem)) {
 			if(value instanceof Integer)
 				base_json.put(mem.name(), (int) value);
 			else if(value instanceof Boolean)
diff --git a/src/de/mrbesen/test/Main.java b/src/de/mrbesen/test/Main.java
index 49ca8d1..87a09b8 100644
--- a/src/de/mrbesen/test/Main.java
+++ b/src/de/mrbesen/test/Main.java
@@ -25,7 +25,9 @@ public class Main implements Runnable, EventListener {
 	}
 
 	public Main() {
-		api = new TelegramAPI("577609137:AAGrlfMHAOQPzN6w9ceNSgFZZCbaiK4gAnw");
+		String token = "692523284:AAEO1xY3GxsIOc5Tb6cI7Ild4IGTStLBiwk";
+		String tokenmain = "577609137:AAGrlfMHAOQPzN6w9ceNSgFZZCbaiK4gAnw";
+		api = new TelegramAPI(token);
 		api.getCommandManager().registerCommand("test", new SimpleTestCase());
 		api.getCommandManager().registerCommand("inlinekb", new InlineKeyboardTC());
 		api.getCommandManager().registerCommand("replykb", new ReplyKeyboardTestCase());
@@ -35,11 +37,16 @@ public class Main implements Runnable, EventListener {
 	
 	@EventHandler
 	public void eventbla(UserSendMessageEvent e) {
-		api.sendMessage(new MessageBuilder().setText("this is a reply").setReciver(e.getUser().getID()).setSilent(true).setNoWebView(true).build());
+		//api.sendMessage(new MessageBuilder().setText("this is a reply").setReciver(e.getUser().getID()).setSilent(true).setNoWebView(true).build());
+		
 		if(oldmsg != null) {
 			oldmsg.forward(e.getUser());
 		}
-		e.getUser().sendStatus(Status.values()[action++]);
+		
+		if(e.getMessage().getText().toLowerCase().startsWith("hey")) {
+			api.sendTypedMessage("Hello!", e.getUser(), 4);
+		}
+		//e.getUser().sendStatus(Status.values()[action++]);
 		action%=Status.values().length;
 		oldmsg = e.getMessage();
 	}