From fc639c6bab3be5ffb8a451baed4b73b32e5326cd Mon Sep 17 00:00:00 2001 From: NovaFox161 Date: Sat, 7 Jul 2018 23:12:58 -0500 Subject: [PATCH] Slowly phasing out use of Unirest in favor of OkHTTP --- pom.xml | 8 ++++++- .../network/discordpw/UpdateDisPwData.java | 23 ++++++++++++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1ff614b7..b0a3bd35 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,6 @@ 1.7.21 compile - org.thymeleaf @@ -155,6 +154,13 @@ 1.1.1 compile + + + com.squareup.okhttp3 + okhttp + 3.10.0 + compile + diff --git a/src/main/java/com/cloudcraftgaming/discal/bot/internal/network/discordpw/UpdateDisPwData.java b/src/main/java/com/cloudcraftgaming/discal/bot/internal/network/discordpw/UpdateDisPwData.java index 3714ca25..61b5e054 100644 --- a/src/main/java/com/cloudcraftgaming/discal/bot/internal/network/discordpw/UpdateDisPwData.java +++ b/src/main/java/com/cloudcraftgaming/discal/bot/internal/network/discordpw/UpdateDisPwData.java @@ -3,9 +3,7 @@ package com.cloudcraftgaming.discal.bot.internal.network.discordpw; import com.cloudcraftgaming.discal.api.DisCalAPI; import com.cloudcraftgaming.discal.api.object.BotSettings; import com.cloudcraftgaming.discal.logger.Logger; -import com.mashape.unirest.http.HttpResponse; -import com.mashape.unirest.http.JsonNode; -import com.mashape.unirest.http.Unirest; +import okhttp3.*; import org.json.JSONObject; import java.util.Timer; @@ -19,6 +17,8 @@ import java.util.TimerTask; public class UpdateDisPwData { private static Timer timer; + private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8"); + public static void init() { if (BotSettings.UPDATE_SITES.get().equalsIgnoreCase("true")) { timer = new Timer(true); @@ -42,8 +42,25 @@ public class UpdateDisPwData { JSONObject json = new JSONObject().put("server_count", serverCount); + /* //noinspection unused HttpResponse response = Unirest.post("https://bots.discord.pw/api/bots/265523588918935552/stats").header("Authorization", BotSettings.PW_TOKEN.get()).header("Content-Type", "application/json").body(json).asJson(); + */ + + OkHttpClient client = new OkHttpClient(); + + RequestBody body = RequestBody.create(JSON, json.toString()); + Request request = new Request.Builder() + .url("https://bots.discord.pw/api/bots/265523588918935552/stats") + .post(body) + .header("Authorization", BotSettings.PW_TOKEN.get()) + .header("Content-Type", "application/json") + .build(); + + Response response = client.newCall(request).execute(); + + if (response.code() == 200) + Logger.getLogger().debug("Successfully updated Discord PW List!"); } catch (Exception e) { //Handle issue. System.out.println("Failed to update Discord PW list metadata!");