fixed #9, code refactored, messages added to config and more

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>TelegramChat</groupId>
 	<artifactId>TelegramChat</artifactId>
-	<version>1.0.10</version>
+	<version>1.0.11</version>
 	<name>TelegramChat</name>
 	<url>https://www.spigotmc.org/resources/telegramchat.16576/</url>
 	<repositories>

src/main/java/de/Linus122/Metrics/Metrics.java

@@ -20,15 +20,16 @@ import com.google.gson.Gson;
 
 /*
  * SpaceIOMetrics main class by Linus122
- * version: 0.05
+ * version: 0.06
  * 
  */
+
 public class Metrics {
 	private Plugin pl;
 	private final Gson gson = new Gson();
 	
 	private String URL = "https://spaceio.xyz/update/%s";
-	private final String VERSION = "0.05";
+	private final String VERSION = "0.06";
 	private int REFRESH_INTERVAL = 600000;
 	
 	public Metrics(Plugin pl){
@@ -133,6 +134,7 @@ public class Metrics {
 	}
 	// method source: http://www.jcgonzalez.com/linux-get-distro-from-java-examples
 	private String getDistro(){
+		
 		// lists all the files ending with -release in the etc folder
         File dir = new File("/etc/");
         File fileList[] = new File[0];
@@ -143,22 +145,25 @@ public class Metrics {
                 }
             });
         }
+        try {
 	        // looks for the version file (not all linux distros)
 	        File fileVersion = new File("/proc/version");
-        if(fileVersion.exists()){
+	        if(fileVersion.exists() && fileList.length > 0){
 	            fileList = Arrays.copyOf(fileList,fileList.length+1);
 	            fileList[fileList.length-1] = fileVersion;
 	        }    
+	        
 	        // prints first version-related file
 	        for (File f : fileList) {
-            try {
 	                BufferedReader br = new BufferedReader(new FileReader(f));
 	                String strLine = null;
 	                while ((strLine = br.readLine()) != null) {
 	                    return strLine;
 	                }
 	                br.close();
-            } catch (Exception e) {}
+	        }
+        } catch (Exception e) {
+        	// Exception is thrown when something went wrong while obtaining the distribution name.
         }
 		return "unknown";    
 	}

src/main/java/de/Linus122/TelegramChat/Data.java

@@ -6,11 +6,72 @@ import java.util.List;
 import java.util.UUID;
 
 public class Data {
-	public String token = "";
+	private String token = "";
 	// Player name // ChatID
-	public HashMap<Integer, UUID> linkedChats = new HashMap<Integer, UUID>();
+	private HashMap<Integer, UUID> linkedChats = new HashMap<Integer, UUID>();
 	// Player name // RandomInt
-	public HashMap<String, UUID> linkCodes = new HashMap<String, UUID>();
+	private HashMap<String, UUID> linkCodes = new HashMap<String, UUID>();
 	public List<Integer> ids = new ArrayList<Integer>();
-	boolean firstUse = true;
+	private boolean firstUse = true;
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public HashMap<Integer, UUID> getLinkedChats() {
+		return linkedChats;
+	}
+
+	public void setLinkedChats(HashMap<Integer, UUID> linkedChats) {
+		this.linkedChats = linkedChats;
+	}
+
+	public HashMap<String, UUID> getLinkCodes() {
+		return linkCodes;
+	}
+
+	public void setLinkCodes(HashMap<String, UUID> linkCodes) {
+		this.linkCodes = linkCodes;
+	}
+
+	public List<Integer> getIds() {
+		return ids;
+	}
+
+	public void setIds(List<Integer> ids) {
+		this.ids = ids;
+	}
+
+	public boolean isFirstUse() {
+		return firstUse;
+	}
+
+	public void setFirstUse(boolean firstUse) {
+		this.firstUse = firstUse;
+	}
+
+	public void addChatPlayerLink(int chatID, UUID player) {
+		linkedChats.put(chatID, player);
+	}
+
+	public void addLinkCode(String code, UUID player) {
+		linkCodes.put(code, player);
+	}
+
+	public UUID getUUIDFromLinkCode(String code) {
+		return linkCodes.get(code);
+	}
+
+	public void removeLinkCode(String code) {
+		linkCodes.remove(code);
+	}
+
+	public UUID getUUIDFromChatID(int chatID) {
+		return linkedChats.get(chatID);
+	}
+
 }

src/main/java/de/Linus122/TelegramChat/LinkTelegramCmd.java

@@ -12,24 +12,25 @@ public class LinkTelegramCmd implements CommandExecutor {
 	@Override
 	public boolean onCommand(CommandSender cs, Command arg1, String arg2, String[] args) {
 		if (!(cs instanceof Player)) {
-			cs.sendMessage("§cSorry, but you can't link the console currently.");
+			cs.sendMessage(Utils.formatMSG("cant-link-console")[0]);
 		}
 		if (!cs.hasPermission("telegram.linktelegram")) {
-			cs.sendMessage("§cYou don't have permissions to use this!");
+			cs.sendMessage(Utils.formatMSG("no-permissions")[0]);
 			return true;
 		}
-		if(Main.data == null){
+		if (Main.getBackend() == null) {
-			Main.data = new Data();
+			Main.initBackend();
 		}
 		if (Main.telegramHook.authJson == null) {
-			cs.sendMessage("§cPlease add a bot to your server first! /telegram");
+			cs.sendMessage(Utils.formatMSG("need-to-add-bot-first")[0]);
 			return true;
 		}
 
 		String token = Main.generateLinkToken();
-		Main.data.linkCodes.put(token, ((Player) cs).getUniqueId());
+		Main.getBackend().addLinkCode(token, ((Player) cs).getUniqueId());
-		cs.sendMessage("§aAdd " + Main.telegramHook.authJson.getAsJsonObject("result").get("username").getAsString() + " to Telegram and send this message to " + Main.telegramHook.authJson.getAsJsonObject("result").get("username").getAsString() + ":");
+		cs.sendMessage(Utils.formatMSG("get-token",
-		cs.sendMessage("§c" + token);
+				Main.telegramHook.authJson.getAsJsonObject("result").get("username").getAsString(),
+				Main.telegramHook.authJson.getAsJsonObject("result").get("username").getAsString(), token));
 
 		return true;
 	}

src/main/java/de/Linus122/TelegramChat/Main.java

@@ -6,8 +6,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.net.URLEncoder;
-import java.text.Format;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -22,7 +20,6 @@ import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import com.google.gson.Gson;
@@ -31,20 +28,19 @@ import de.Linus122.Metrics.Metrics;
 import de.Linus122.TelegramComponents.Chat;
 import de.Linus122.TelegramComponents.ChatMessageToMc;
 
-
 public class Main extends JavaPlugin implements Listener {
-	public static File datad = new File("plugins/TelegramChat/data.json");
+	private static File datad = new File("plugins/TelegramChat/data.json");
-	public static FileConfiguration cfg;
+	private static FileConfiguration cfg;
 
-	public static Data data = new Data();
+	private static Data data = new Data();
-	static Plugin pl;
 	public static Telegram telegramHook;
 
 	@Override
 	public void onEnable() {
 		this.saveDefaultConfig();
 		cfg = this.getConfig();
-		this.pl = this;
+		Utils.cfg = cfg;
+
 		Bukkit.getPluginCommand("telegram").setExecutor(new TelegramCmd());
 		Bukkit.getPluginCommand("linktelegram").setExecutor(new LinkTelegramCmd());
 		Bukkit.getPluginManager().registerEvents(this, this);
@@ -65,22 +61,28 @@ public class Main extends JavaPlugin implements Listener{
 			}
 		}
 		telegramHook = new Telegram();
-		telegramHook.auth(data.token);
+		telegramHook.auth(data.getToken());
 
-		Bukkit.getScheduler().scheduleAsyncRepeatingTask(this, new Runnable(){
+		Bukkit.getScheduler().runTaskTimerAsynchronously(this, () -> {
 			boolean connectionLost = false;
-			public void run(){
 			if (connectionLost) {
 				boolean success = telegramHook.reconnect();
-					if(success) connectionLost = false;
+				if (success)
+					connectionLost = false;
 			}
 			if (telegramHook.connected) {
 				connectionLost = !telegramHook.getUpdate();
 			}
-			}
+		}, 10L, 10L);
-		}, 20L, 20L);
+
 		new Metrics(this);
 	}
+
+	@Override
+	public void onDisable() {
+		save();
+	}
+
 	public static void save() {
 		Gson gson = new Gson();
 
@@ -96,31 +98,40 @@ public class Main extends JavaPlugin implements Listener{
 			e.printStackTrace();
 		}
 	}
-	@Override
+
-	public void onDisable(){
+	public static Data getBackend() {
-		save();
+		return data;
 	}
+
+	public static void initBackend() {
+		data = new Data();
+	}
+
 	public static void sendToMC(ChatMessageToMc chatMsg) {
 		sendToMC(chatMsg.getUuid_sender(), chatMsg.getContent(), chatMsg.getChatID_sender());
 	}
+
 	private static void sendToMC(UUID uuid, String msg, int sender) {
 		OfflinePlayer op = Bukkit.getOfflinePlayer(uuid);
 		List<Integer> recievers = new ArrayList<Integer>();
 		recievers.addAll(Main.data.ids);
 		recievers.remove((Object) sender);
-		String msgF = Main.cfg.getString("chat-format").replace('&', '§').replace("%player%", op.getName()).replace("%message%", msg);
+		String msgF = Utils.formatMSG("general-message-to-mc", op.getName(), msg)[0];
 		for (int id : recievers) {
 			telegramHook.sendMsg(id, msgF);
 		}
 		Bukkit.broadcastMessage(msgF.replace("&", "§"));
 
 	}
+
 	public static void link(UUID player, int chatID) {
-		Main.data.linkedChats.put(chatID, player);
+		Main.data.addChatPlayerLink(chatID, player);
 		OfflinePlayer p = Bukkit.getOfflinePlayer(player);
 		telegramHook.sendMsg(chatID, "Success! Linked " + p.getName());
 	}
+
 	public static String generateLinkToken() {
+
 		Random rnd = new Random();
 		int i = rnd.nextInt(9999999);
 		String s = i + "";
@@ -138,48 +149,55 @@ public class Main extends JavaPlugin implements Listener{
 		}
 		return finals;
 	}
+
 	@EventHandler
 	public void onJoin(PlayerJoinEvent e) {
-		if(!this.getConfig().getBoolean("enable-joinquitmessages")) return;
+		if (!this.getConfig().getBoolean("enable-joinquitmessages"))
+			return;
 		if (telegramHook.connected) {
 			Chat chat = new Chat();
 			chat.parse_mode = "Markdown";
-			chat.text = "`" + e.getPlayer().getName() + " joined the game.`";
+			chat.text = Utils.formatMSG("join-message", e.getPlayer().getName())[0];
 			telegramHook.sendAll(chat);
 		}
 	}
+
 	@EventHandler
 	public void onDeath(PlayerDeathEvent e) {
-		if(!this.getConfig().getBoolean("enable-deathmessages")) return;
+		if (!this.getConfig().getBoolean("enable-deathmessages"))
+			return;
 		if (telegramHook.connected) {
 			Chat chat = new Chat();
 			chat.parse_mode = "Markdown";
-			chat.text = "`"+e.getDeathMessage() + "`";
+			chat.text = Utils.formatMSG("death-message", e.getDeathMessage())[0];
 			telegramHook.sendAll(chat);
 		}
 	}
+
 	@EventHandler
 	public void onQuit(PlayerQuitEvent e) {
-		if(!this.getConfig().getBoolean("enable-joinquitmessages")) return;
+		if (!this.getConfig().getBoolean("enable-joinquitmessages"))
+			return;
 		if (telegramHook.connected) {
 			Chat chat = new Chat();
 			chat.parse_mode = "Markdown";
-			chat.text = "`" + e.getPlayer().getName() + " left the game.`";
+			chat.text = Utils.formatMSG("quit-message", e.getPlayer().getName())[0];
-			System.out.println(chat.text);
 			telegramHook.sendAll(chat);
 		}
 	}
+
 	@EventHandler
 	public void onChat(AsyncPlayerChatEvent e) {
-		if(!this.getConfig().getBoolean("enable-chatmessages")) return;
+		if (!this.getConfig().getBoolean("enable-chatmessages"))
+			return;
 		if (telegramHook.connected) {
 			Chat chat = new Chat();
 			chat.parse_mode = "Markdown";
-			chat.text = escape(e.getPlayer().getName()) + ": " + escape(e.getMessage()).replaceAll("§.", "") ;
+			chat.text = Utils
+					.escape(Utils.formatMSG("general-message-to-telegram", e.getPlayer().getName(), e.getMessage())[0])
+					.replaceAll("§.", "");
 			telegramHook.sendAll(chat);
 		}
 	}
-	public String escape(String str){
+
-		return str.replace("_", "\\_");
-	}
 }

src/main/java/de/Linus122/TelegramChat/Telegram.java

@@ -20,7 +20,6 @@ import com.google.gson.JsonParser;
 import de.Linus122.TelegramComponents.Chat;
 import de.Linus122.TelegramComponents.ChatMessageToMc;
 
-
 public class Telegram {
 	public JsonObject authJson;
 	public boolean connected = false;
@@ -30,6 +29,10 @@ public class Telegram {
 
 	private List<TelegramActionListener> listeners = new ArrayList<TelegramActionListener>();
 
+	private final String API_URL_GETME = "https://api.telegram.org/bot%s/getMe";
+	private final String API_URL_GETUPDATES = "https://api.telegram.org/bot%s/getUpdates?offset=%d";
+	private final String API_URL_GENERAL = "https://api.telegram.org/bot%s/%s";
+
 	public void addListener(TelegramActionListener actionListener) {
 		listeners.add(actionListener);
 	}
@@ -38,9 +41,10 @@ public class Telegram {
 		this.token = token;
 		return reconnect();
 	}
+
 	public boolean reconnect() {
 		try {
-			JsonObject obj = sendGet("https://api.telegram.org/bot" + token + "/getMe");
+			JsonObject obj = sendGet(String.format(API_URL_GETME, token));
 			authJson = obj;
 			System.out.print("[Telegram] Established a connection with the telegram servers.");
 			connected = true;
@@ -51,10 +55,11 @@ public class Telegram {
 			return false;
 		}
 	}
+
 	public boolean getUpdate() {
 		JsonObject up = null;
 		try {
-			up = sendGet("https://api.telegram.org/bot" + Main.data.token + "/getUpdates?offset=" + (lastUpdate + 1));
+			up = sendGet(String.format(API_URL_GETUPDATES, Main.getBackend().getToken(), lastUpdate + 1));
 		} catch (IOException e) {
 			return false;
 		}
@@ -72,49 +77,44 @@ public class Telegram {
 						JsonObject chat = obj.getAsJsonObject("message").getAsJsonObject("chat");
 						if (chat.get("type").getAsString().equals("private")) {
 							int id = chat.get("id").getAsInt();
-							if(!Main.data.ids.contains(id)) Main.data.ids.add(id);
+							if (!Main.getBackend().ids.contains(id))
+								Main.getBackend().ids.add(id);
 
 							if (obj.getAsJsonObject("message").has("text")) {
 								String text = obj.getAsJsonObject("message").get("text").getAsString();
-								for(char c : text.toCharArray()){
+								if (text.length() == 0)
-									/*if((int) c == 55357){
-										this.sendMsg(id, "Emoticons are not allowed, sorry!");
 									return true;
-									}*/
-
-								}
-								if(text.length() == 0) return true;
 								if (text.equals("/start")) {
-									if(Main.data.firstUse){
+									if (Main.getBackend().isFirstUse()) {
-										Main.data.firstUse = false;
+										Main.getBackend().setFirstUse(false);
 										Chat chat2 = new Chat();
 										chat2.chat_id = id;
 										chat2.parse_mode = "Markdown";
-										chat2.text = "Congratulations, your bot is working! Have fun with this Plugin. Feel free to donate via *PayPal* to keep this project up to date! [PayPal Donation URL](http://donate.spaceio.xyz/)";
+										chat2.text = Utils.formatMSG("setup-msg")[0];
 										this.sendMsg(chat2);
 									}
-									this.sendMsg(id, "You can see the chat but you can't chat at the moment. Type */linktelegram ingame* to chat!");
+									this.sendMsg(id, Utils.formatMSG("can-see-but-not-chat")[0]);
-								}else
+								} else if (Main.getBackend().getLinkCodes().containsKey(text)) {
-								if(Main.data.linkCodes.containsKey(text)){
 									// LINK
-									Main.link(Main.data.linkCodes.get(text), id);
+									Main.link(Main.getBackend().getUUIDFromLinkCode(text), id);
-									Main.data.linkCodes.remove(text);
+									Main.getBackend().removeLinkCode(text);
-								}else if(Main.data.linkedChats.containsKey(id)){
+								} else if (Main.getBackend().getLinkedChats().containsKey(id)) {
-									ChatMessageToMc chatMsg = new ChatMessageToMc(Main.data.linkedChats.get(id), text, id);
+									ChatMessageToMc chatMsg = new ChatMessageToMc(
+											Main.getBackend().getUUIDFromChatID(id), text, id);
 									for (TelegramActionListener actionListener : listeners) {
 										actionListener.onSendToMinecraft(chatMsg);
 									}
 
 									Main.sendToMC(chatMsg);
 								} else {
-									this.sendMsg(id, "Sorry, please link your account with */linktelegram ingame* to use the chat!");
+									this.sendMsg(id, Utils.formatMSG("need-to-link")[0]);
 								}
 							}
 
 						} else if (chat.get("type").getAsString().equals("group")) {
 							int id = chat.get("id").getAsInt();
-							if(!Main.data.ids.contains(id))
+							if (!Main.getBackend().ids.contains(id))
-								Main.data.ids.add(id);
+								Main.getBackend().ids.add(id);
 						}
 					}
 
@@ -130,6 +130,7 @@ public class Telegram {
 		chat.text = msg;
 		sendMsg(chat);
 	}
+
 	public void sendMsg(Chat chat) {
 		for (TelegramActionListener actionListener : listeners) {
 			actionListener.onSendToTelegram(chat);
@@ -139,11 +140,11 @@ public class Telegram {
 		post("sendMessage", gson.toJson(chat, Chat.class));
 
 	}
+
 	public void sendAll(final Chat chat) {
 		new Thread(new Runnable() {
 			public void run() {
-				Gson gson = new Gson();
+				for (int id : Main.getBackend().ids) {
-				for(int id : Main.data.ids){
 					chat.chat_id = id;
 					// post("sendMessage", gson.toJson(chat, Chat.class));
 					sendMsg(chat);
@@ -151,10 +152,11 @@ public class Telegram {
 			}
 		}).start();
 	}
+
 	public void post(String method, String json) {
 		try {
 			String body = json;
-			URL url = new URL("https://api.telegram.org/bot" + Main.data.token + "/" + method);
+			URL url = new URL(String.format(API_URL_GENERAL, Main.getBackend().getToken(), method));
 			HttpURLConnection connection = (HttpURLConnection) url.openConnection();
 			connection.setRequestMethod("POST");
 			connection.setDoInput(true);
@@ -163,23 +165,14 @@ public class Telegram {
 			connection.setRequestProperty("Content-Type", "application/json; ; Charset=UTF-8");
 			connection.setRequestProperty("Content-Length", String.valueOf(body.length()));
 
-			
 			DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
 			BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(wr, "UTF-8"));
 			writer.write(body);
 			writer.close();
 			wr.close();
 
-			//OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream());
-			//writer.write(body);
-			//writer.flush();
-
 			BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
 
-			for (String line; (line = reader.readLine()) != null;) {
-				
-			}
-
 			writer.close();
 			reader.close();
 		} catch (Exception e) {
@@ -207,4 +200,5 @@ public class Telegram {
 		return parser.parse(all).getAsJsonObject();
 
 	}
+
 }

src/main/java/de/Linus122/TelegramChat/TelegramActionListener.java

@@ -5,5 +5,6 @@ import de.Linus122.TelegramComponents.ChatMessageToMc;
 
 public interface TelegramActionListener {
 	public void onSendToTelegram(Chat chat);
+
 	public void onSendToMinecraft(ChatMessageToMc chatMsg);
 }

src/main/java/de/Linus122/TelegramChat/TelegramCmd.java

@@ -16,17 +16,18 @@ public class TelegramCmd implements CommandExecutor {
 			cs.sendMessage("§c/telegram [token]");
 			return true;
 		}
-		if(Main.data == null){
+		if (Main.getBackend() == null) {
-			Main.data = new Data();
+			Main.initBackend();
 		}
-		Main.data.token = args[0];
+		Main.getBackend().setToken(args[0]);
 		Main.save();
 		boolean success = false;
 
-		success = Main.telegramHook.auth(Main.data.token);
+		success = Main.telegramHook.auth(Main.getBackend().getToken());
 		if (success) {
 			cs.sendMessage("§cSuccessfully connected to Telegram!");
-			cs.sendMessage("§aAdd " + Main.telegramHook.authJson.getAsJsonObject("result").get("username").getAsString() + " to Telegram!");
+			cs.sendMessage("§aAdd " + Main.telegramHook.authJson.getAsJsonObject("result").get("username").getAsString()
+					+ " to Telegram!");
 		} else {
 			cs.sendMessage("§cWrong token. Paste in the whole token!");
 		}

src/main/java/de/Linus122/TelegramChat/Utils.java

@@ -0,0 +1,31 @@
+package de.Linus122.TelegramChat;
+
+import org.bukkit.configuration.file.FileConfiguration;
+
+public class Utils {
+	public static String escape(String str) {
+		return str.replace("_", "\\_");
+	}
+
+	public static FileConfiguration cfg;
+
+	final static String MESSAGE_SECTION = "messages";
+
+	public static String[] formatMSG(String suffixKey) {
+		return formatMSG(suffixKey, "");
+	}
+
+	public static String[] formatMSG(String suffixKey, Object... args) {
+		String key = MESSAGE_SECTION + "." + suffixKey;
+		if (!cfg.contains(key))
+			return new String[] {
+					"Message not found in config.yml. Please check your config if the following key is present:", key };
+		String rawMessage = cfg.getString(key);
+		if (args != null && args.length > 0)
+			rawMessage = String.format(rawMessage, args);
+		rawMessage = rawMessage.replace("&", "§");
+
+		return rawMessage.split("\\n");
+
+	}
+}

src/main/resources/config.yml

@@ -1,4 +1,19 @@
-chat-format: '&c[Telegram]&r %player%: %message%'
+messages:
+  # telegram messages
+  general-message-to-mc: "&c[Telegram]&r %s: %s"
+  join-message: "`%s joined the game.`"
+  quit-message: "`%s left the game.`"
+  death-message: "`%s`"
+  need-to-link: "Sorry, please link your account with */linktelegram ingame* to use the chat!"
+  can-see-but-not-chat: "You can see the chat but you can't chat at the moment. Type */linktelegram ingame* to chat!"
+  success-linked: "Success! Linked %s"
+  setup-msg: "Congratulations, your bot is working! Have fun with this Plugin. Feel free to donate via *PayPal* to keep this project up to date! [PayPal Donation URL](http://donate.spaceio.xyz/)"
+  # minecraft message:
+  general-message-to-telegram: "%s: %s"
+  no-permissions: "&cYou don't have permissions to use this!"
+  cant-link-console: "&cSorry, but you can't link the console currently."
+  need-to-add-bot-first: "&cPlease add a bot to your server first! /telegram"
+  get-token: "&aAdd %s to Telegram and send this message to %s: \n%s"
 enable-joinquitmessages: true
 enable-deathmessages: true
 enable-chatmessages: true