fixed dropping connections

mastercake10 · Feb 8, 2018 · 2cbd924 · 2cbd924
1 parent 6199a11
commit 2cbd924
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>TelegramChat</groupId>
 	<artifactId>TelegramChat</artifactId>
-	<version>1.0.9.9</version>
+	<version>1.0.10</version>
 	<name>TelegramChat</name>
 	<url>https://www.spigotmc.org/resources/telegramchat.16576/</url>
 	<repositories>

diff --git a/src/main/java/de/Linus122/TelegramChat/Main.java b/src/main/java/de/Linus122/TelegramChat/Main.java
@@ -67,10 +67,15 @@ public void onEnable(){
 		telegramHook = new Telegram();
 		telegramHook.auth(data.token);
 
-		Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new Runnable(){
+		Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, new Runnable(){
+			boolean connectionLost = false;
 			public void run(){
+				if(connectionLost){
+					boolean success = telegramHook.reconnect();
+					if(success) connectionLost = false;
+				}
 				if(telegramHook.connected){
-					telegramHook.getUpdate();
+					connectionLost = !telegramHook.getUpdate();
 				}
 			}
 		}, 20L, 20L);

diff --git a/src/main/java/de/Linus122/TelegramChat/Telegram.java b/src/main/java/de/Linus122/TelegramChat/Telegram.java
@@ -42,6 +42,7 @@ public boolean reconnect(){
 		try{
 			JsonObject obj = sendGet("https://api.telegram.org/bot" + token + "/getMe");
 			authJson = obj;
+			System.out.print("[Telegram] Established a connection with the telegram servers.");
 			connected = true;
 			return true;
 		}catch(Exception e){
@@ -50,16 +51,15 @@ public boolean reconnect(){
 			return false;
 		}
 	}
-	public void getUpdate(){
+	public boolean getUpdate(){
 		JsonObject up = null;
 		try {
 			up = sendGet("https://api.telegram.org/bot" + Main.data.token + "/getUpdates?offset=" + (lastUpdate + 1));
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			return false;
 		}
 		if(up == null){
-			reconnect();
+			return false;
 		}
 		if(up.has("result")){
 			for (JsonElement ob : up.getAsJsonArray("result")) {
@@ -79,10 +79,10 @@ public void getUpdate(){
 								for(char c : text.toCharArray()){
 									if((int) c == 55357){
 										this.sendMsg(id, "Emoticons are not allowed, sorry!");
-										return;
+										return true;
 									}
 								}
-								if(text.length() == 0) return;
+								if(text.length() == 0) return true;
 								if(text.equals("/start")){
 									if(Main.data.firstUse){
 										Main.data.firstUse = false;
@@ -119,6 +119,7 @@ public void getUpdate(){
 				}
 			}	
 		}
+		return true;
 	}
 
 	public void sendMsg(int id, String msg){