From 05abe6fc8adc242054fd38448458f5d26881ed2f Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sun, 5 Jun 2016 00:28:11 +0200 Subject: [PATCH 1/2] [BUGFIX] Set randoms url to BDN V3 --- src/main/java/org/parabot/core/Configuration.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/parabot/core/Configuration.java b/src/main/java/org/parabot/core/Configuration.java index 5ae8cdc..058ab25 100644 --- a/src/main/java/org/parabot/core/Configuration.java +++ b/src/main/java/org/parabot/core/Configuration.java @@ -8,7 +8,6 @@ import org.parabot.environment.api.utils.Version; * @author Everel */ public class Configuration { -// public static final String LOGIN_SERVER = "https://www.parabot.org/community/api/login.php?username=%s&password=%s"; public static final String LOGIN_SERVER = "http://bdn.parabot.org/api/v2/users/login"; public static final String GET_SCRIPTS = "http://bdn.parabot.org/api/get.php?action=scripts_scripts&server="; public static final String GET_SCRIPT = "http://bdn.parabot.org/api/get.php?action=scripts_script&id="; @@ -20,10 +19,9 @@ public class Configuration { public static final String API_DOWNLOAD_BOT = "http://bdn.parabot.org/api/v2/bot/download/client/"; public static final String DOWNLOAD_BOT = "http://bdn.parabot.org/versions/"; public static final String REGISTRATION_PAGE = "https://www.parabot.org/community/register/"; - public static final String GET_RANDOMS = "http://bdn.parabot.org/api/get.php?action=randoms"; + public static final String GET_RANDOMS = "http://v3.bdn.parabot.org/api/bot/download/randoms"; public static final String DATA_API = "http://bdn.parabot.org/api/v2/data/"; public static final String ITEM_API = DATA_API + "items/"; - public static final String BUGSNAG_API = "d79752cf94dd4beb24c3d312a8609f53"; public static final Version BOT_VERSION = ProjectProperties.getProjectVersion(); From 2f2546fecea11e158a9bac07fa7edd137bb45c4f Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sun, 5 Jun 2016 00:53:17 +0200 Subject: [PATCH 2/2] [TASK] Set bot version to API V3 --- src/main/java/org/parabot/core/Configuration.java | 2 +- src/main/java/org/parabot/core/Core.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/core/Configuration.java b/src/main/java/org/parabot/core/Configuration.java index 058ab25..249efb1 100644 --- a/src/main/java/org/parabot/core/Configuration.java +++ b/src/main/java/org/parabot/core/Configuration.java @@ -15,7 +15,7 @@ public class Configuration { public static final String GET_SERVER_PROVIDER = "http://bdn.parabot.org/api/get.php?action=server_provider&name="; public static final String GET_SERVER_PROVIDER_INFO = "http://bdn.parabot.org/api/get.php?action=server_information&name="; public static final String GET_SERVER_SETTINGS = "http://bdn.parabot.org/api/get.php?action=get_settings"; - public static final String GET_BOT_VERSION = "http://bdn.parabot.org/api/v2/bot/version"; + public static final String GET_BOT_VERSION = "http://v3.bdn.parabot.org/api/bot/list/client?latest=true"; public static final String API_DOWNLOAD_BOT = "http://bdn.parabot.org/api/v2/bot/download/client/"; public static final String DOWNLOAD_BOT = "http://bdn.parabot.org/versions/"; public static final String REGISTRATION_PAGE = "https://www.parabot.org/community/register/"; diff --git a/src/main/java/org/parabot/core/Core.java b/src/main/java/org/parabot/core/Core.java index 57cada3..ef565cb 100644 --- a/src/main/java/org/parabot/core/Core.java +++ b/src/main/java/org/parabot/core/Core.java @@ -220,7 +220,7 @@ public class Core { latestVersion = null; if (br != null) { JSONObject object = (JSONObject) WebUtil.getJsonParser().parse(br); - latestVersion = new Version((String) object.get("result")); + latestVersion = new Version((String) object.get("version")); } if (latestVersion != null) { if (Configuration.BOT_VERSION.compareTo(latestVersion) < 0) {