Working monocle support (tested on Hydro74000) + new features

Only store messages if logging is enabled

new config vars:
  - Renamed useRmDb to useScanDb
  - maxStoredMessages used to limit the amount of messages to store at any time, only used if logging is enabled.
  - protocol and useSSL parameters added to both [scanner db] and [novabot db] blocks, defaults to mysql and true respectively

new team icons (valor, uncontested, mystic, instinct)

new substitutions:
  - team_icon for raids
  - quick_move_type and charge_move_type
  - quick_move_type_icon and charge_move_type_icon

Improved error catching/handling.

Fixed some typos + more

Author: parislarkins

README.MD

@@ -2,7 +2,7 @@
 token =
 blacklist = [13, 16, 19, 21, 23, 29, 32, 41, 48, 60, 98, 115, 118, 120, 183, 161, 165, 167, 177, 194, 198]
 raidBosses = [2,5,8,11,28,31,34,38,62,65,68,71,73,76,82,91,94,105,123,129,131,137,139,143,144,145,146,150,243,244,245,248,249,302,303,359]
-useRmDb = true
+useScanDb = true
 scannerType = rocketmap
 googleSuburbField = city
 pokemon = true

config.example.ini

@@ -2,25 +2,24 @@
 encounteredTitle = [<city>] <pkmn> <form>
 title = [<city>] <pkmn> <form>
 titleUrl = <gmaps>
-encounteredBody = **Available until: <24h_time> (<time_left>)**\n\nLvl30+ IVs: <atk>A/<def>D/<sta>S (<iv>%)\nLvl30+ CP: <cp> (lvl <level>)\nLvl30+ Moveset: <quick_move> - <charge_move>\nGender: <gender>, Height: <height>, Weight: <weight>
+encounteredBody = **Available until: <24h_time> (<time_left>)**\n\nLvl30+ IVs: <atk>A/<def>D/<sta>S (<iv>%)\nLvl30+ CP: <cp> (lvl <level>)\nLvl30+ Moveset: <quick_move><quick_move_type_icon> - <charge_move><charge_move_type_icon>\nGender: <gender>, Height: <height>, Weight: <weight>
 body = **Available until: <24h_time> (<time_left>)**\n\n
-content = <@&1028313314183>
 showMap = true
 mapZoom = 15
 mapWidth = 255
 mapHeight = 225
 [raidEgg]
 title = [<city>] Level <level> raid
 titleUrl = <gmaps>
-body = **Raid will start at <24h_start> (<time_left_start>)**\n**Gym Name:** <gym_name>
+body = **Raid will start at <24h_start> (<time_left_start>)**\n**Gym Name:** <gym_name>\n**Gym Owners:** <team_name> <team_icon>
 showMap = true
 mapZoom = 15
 mapWidth = 255
 mapHeight = 225
 [raidBoss]
 title = [<city>] <pkmn> raid (lvl <level>)
 titleUrl = <gmaps>
-body = **Available until <24h_end> (<time_left>)**\n**Gym Name:** <gym_name> \n**CP:** <cp>\n**Moveset:** <quick_move> - <charge_move>
+body = **Available until <24h_end> (<time_left>)**\n**Gym Name:** <gym_name> \n**Gym Owners:** <team_name> <team_icon>\n**CP:** <cp>\n**Moveset:** <quick_move><quick_move_type_icon> - <charge_move><charge_move_type_icon>
 showMap = true
 mapZoom = 15
 mapWidth = 255

formatting.ini

@@ -15,7 +15,6 @@
 import org.ini4j.Ini;
 import pokemon.PokeSpawn;
 import pokemon.Pokemon;
-import raids.Raid;
 import raids.RaidSpawn;
 
 import java.io.File;
@@ -25,8 +24,6 @@
 import java.time.ZoneId;
 import java.util.*;
 
-import static raids.Raid.emotes;
-
 /**
  * Created by Owner on 13/05/2017.
  */
@@ -48,7 +45,7 @@ public class Config {
     private boolean startupMessage = false;
     private boolean countLocationsInLimits = true;
     private ScannerType scannerType = ScannerType.RocketMap;
-    private boolean useRmDb = true;
+    private boolean useScanDb = true;
     private boolean raidsEnabled = true;
     private boolean pokemonEnabled = true;
     private boolean raidOrganisationEnabled = true;
@@ -67,16 +64,19 @@ public class Config {
     private String scanPort = "3306";
     private String scanDbName;
     private String scanProtocol = "mysql";
+    private String scanUseSSL = "true";
     private String nbUser;
     private String nbPass;
     private String nbIp;
     private String nbPort = "3306";
     private String nbDbName;
     private String nbProtocol = "mysql";
+    private String nbUseSSL = "true";
     private long pokePollingDelay = 2;
     private long raidPollingDelay = 15;
     private int pokemonThreads = 2;
     private int raidThreads = 2;
+    private int maxStoredMessages = 1000000;
     private NotificationLimit nonSupporterLimit = new NotificationLimit(null, null, null);
     private ArrayList<String> GMAPS_KEYS = new ArrayList<>();
     private HashMap<GeofenceIdentifier, String> raidChats = new HashMap<>();
@@ -109,7 +109,7 @@ public Config(Ini configIni, NovaBot novaBot) {
             raidBosses.add(Integer.valueOf(s));
         }
 
-        useRmDb = config.get("useRmDb", Boolean.class, useRmDb);
+        useScanDb = config.get("useScanDb", Boolean.class, useScanDb);
 
         scannerType = ScannerType.fromString(config.get("scannerType",scannerType.toString()));
 
@@ -133,10 +133,12 @@ public Config(Ini configIni, NovaBot novaBot) {
 
         countLocationsInLimits = config.get("countLocationsInLimits", Boolean.class, countLocationsInLimits);
 
-
         logging = config.get("logging", Boolean.class, logging);
 
+
         if (logging) {
+            maxStoredMessages = config.get("maxStoredMessages",Integer.class, maxStoredMessages);
+
             roleLogId = config.get("roleLogChannel", roleLogId);
 
             userUpdatesId = config.get("userUpdatesChannel", userUpdatesId);
@@ -180,6 +182,7 @@ public Config(Ini configIni, NovaBot novaBot) {
         scanPort = scannerDb.get("port", scanPort);
         scanDbName = scannerDb.get("dbName", scanDbName);
         scanProtocol = scannerDb.get("protocol", scanProtocol);
+        scanUseSSL = scannerDb.get("useSSL",scanUseSSL);
 
         Ini.Section novabotDb = configIni.get("novabot db");
         nbUser = novabotDb.get("user", nbUser);
@@ -188,6 +191,7 @@ public Config(Ini configIni, NovaBot novaBot) {
         nbPort = novabotDb.get("port", nbPort);
         nbDbName = novabotDb.get("dbName", nbDbName);
         nbProtocol = novabotDb.get("protocol", nbProtocol);
+        nbUseSSL = novabotDb.get("useSSL",nbUseSSL);
 
         novaBot.novabotLog.info("Finished loading config.ini");
 
@@ -253,7 +257,11 @@ public ArrayList<String> findMatchingPresets(PokeSpawn pokeSpawn) {
     public String formatStr(HashMap<String, String> properties, String toFormat) {
         final String[] str = {toFormat};
 
-        properties.forEach((key, value) -> str[0] = str[0].replace(String.format("<%s>", key), value));
+        for (Map.Entry<String, String> stringStringEntry : properties.entrySet()) {
+            str[0] = str[0].replace(String.format("<%s>", stringStringEntry.getKey()), stringStringEntry.getValue());
+        }
+
+//        properties.forEach((key, value) -> str[0] = str[0].replace(String.format("<%s>", key), value));
 
         return str[0];
     }
@@ -483,18 +491,33 @@ public boolean isRaidOrganisationEnabled() {
     }
 
     public void loadEmotes() {
-        for (String type : Raid.TYPES) {
+        for (String type : Types.TYPES) {
             List<Emote> found = novaBot.jda.getEmotesByName(type, true);
             if (found.size() == 0) try {
                 novaBot.guild.getController().createEmote(type, Icon.from(new File("static/icons/" + type + ".png"))).queue(emote ->
-                                                                                                                                    emotes.put(type, emote));
+                                                                                                                                    Types.emotes.put(type, emote));
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            else {
+                Types.emotes.put(type, found.get(0));
+            }
+        }
+        novaBot.novabotLog.info(String.format("Finished loading type emojis: %s", Types.emotes.toString()));
+
+        for (Team team : Team.values()) {
+            List<Emote> found = novaBot.jda.getEmotesByName(team.toString().toLowerCase(), true);
+            if (found.size() == 0) try {
+                novaBot.guild.getController().createEmote(team.toString().toLowerCase(), Icon.from(new File("static/icons/" + team.toString().toLowerCase() + ".png"))).queue(emote ->
+                        Team.emotes.put(team, emote));
             } catch (IOException e) {
                 e.printStackTrace();
             }
             else {
-                emotes.put(type, found.get(0));
+                Team.emotes.put(team, found.get(0));
             }
         }
+        novaBot.novabotLog.info(String.format("Finished loading team emojis: %s", Team.emotes.toString()));
     }
 
     public boolean loggingEnabled() {
@@ -504,18 +527,23 @@ public boolean loggingEnabled() {
     public static void main(String[] args) {
         NovaBot novaBot = new NovaBot();
         novaBot.setup();
-        System.out.println(novaBot.config.token);
+        System.out.println(Util.getCurrentTime(ZoneId.of("+02:00")));
+        novaBot.config.matchesFilter(novaBot.config.raidFilters.get("raidfilter.json"),new RaidSpawn(383,5,false));
     }
 
     public boolean matchesFilter(JsonObject filter, RaidSpawn raidSpawn) {
         String searchStr = (raidSpawn.bossId >= 1) ? Pokemon.getFilterName(raidSpawn.bossId) : "Egg" + raidSpawn.raidLevel;
 
         JsonElement raidFilter = searchFilter(filter, searchStr);
         if (raidFilter == null) {
+            RaidNotificationSender.notificationLog.info(String.format("couldn't find filter for '%s'",searchStr));
 //            System.out.println(String.format("raidFilter %s is null for %s for channel with id %s", channel.filterName, searchStr,channel.channelId));
             raidFilter = searchFilter(filter, "Level" + raidSpawn.raidLevel);
 
-            if (raidFilter == null) return false;
+            if (raidFilter == null) {
+                RaidNotificationSender.notificationLog.info(String.format("couldn't find filter for '%s'","Level" + raidSpawn.raidLevel));
+                return false;
+            }
         }
 
         if (raidFilter.isJsonObject()) {
@@ -653,8 +681,8 @@ public boolean useGeofences() {
         return Geofencing.notEmpty();
     }
 
-    public boolean useRmDb() {
-        return useRmDb;
+    public boolean useScanDb() {
+        return useScanDb;
     }
 
     private void loadFilter(String filterName, HashMap<String, JsonObject> filterMap) {
@@ -1127,4 +1155,16 @@ public String getNbProtocol() {
     public String getScanProtocol() {
         return scanProtocol;
     }
+
+    public String getScanUseSSL() {
+        return scanUseSSL;
+    }
+
+    public String getNbUseSSL() {
+        return nbUseSSL;
+    }
+
+    public int getMaxStoredMessages() {
+        return maxStoredMessages;
+    }
 }