Skip to content

Commit

Permalink
Scarsz/DiscordSRV -> DiscordSRV/DiscordSRV
Browse files Browse the repository at this point in the history
  • Loading branch information
Scarsz committed Jul 13, 2019
1 parent 5f1d2dd commit d2ef71a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![GitHub downloads](https://img.shields.io/github/downloads/DiscordSRV/DiscordSRV/total.svg)](https://github.com/DiscordSRV/DiscordSRV/releases/latest)
![Code size in bytes](https://img.shields.io/github/languages/code-size/badges/shields.svg)
[![GitHub contributors](https://img.shields.io/github/contributors/DiscordSRV/DiscordSRV.svg)](https://github.com/DiscordSRV/DiscordSRV/graphs/contributors)
[![License](https://img.shields.io/github/license/Scarsz/DiscordSRV.svg)](https://github.com/Scarsz/DiscordSRV/blob/master/LICENSE)
[![License](https://img.shields.io/github/license/DiscordSRV/DiscordSRV.svg)](https://github.com/DiscordSRV/DiscordSRV/blob/master/LICENSE)

A Minecraft to Discord and back link plugin

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/github/scarsz/discordsrv/DiscordSRV.java
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ public void init() {

// random phrases for debug handler
if (!getConfig().getBoolean("RandomPhrasesDisabled"))
Collections.addAll(randomPhrases, HttpUtil.requestHttp("https://raw.githubusercontent.com/Scarsz/DiscordSRV/randomaccessfiles/randomphrases").split("\n"));
Collections.addAll(randomPhrases, HttpUtil.requestHttp("https://raw.githubusercontent.com/DiscordSRV/DiscordSRV/randomaccessfiles/randomphrases").split("\n"));

// shutdown previously existing jda if plugin gets reloaded
if (jda != null) try { jda.shutdown(); jda = null; } catch (Exception e) { e.printStackTrace(); }
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/github/scarsz/discordsrv/util/UpdateUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ public static boolean checkForUpdates() {
return false;
}

String minimumHash = HttpUtil.requestHttp("https://raw.githubusercontent.com/Scarsz/DiscordSRV/randomaccessfiles/minimumbuild").trim();
String minimumHash = HttpUtil.requestHttp("https://raw.githubusercontent.com/DiscordSRV/DiscordSRV/randomaccessfiles/minimumbuild").trim();
if (minimumHash.length() == 40) { // make sure we have a hash
JsonObject minimumComparisonResult = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/Scarsz/DiscordSRV/compare/" + minimumHash + "..." + buildHash), JsonObject.class);
JsonObject minimumComparisonResult = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/DiscordSRV/DiscordSRV/compare/" + minimumHash + "..." + buildHash), JsonObject.class);
boolean minimumAhead = minimumComparisonResult.get("status").getAsString().equalsIgnoreCase("behind");
if (minimumAhead) {
printUpdateMessage("The current build of DiscordSRV does not meet the minimum required to be secure! DiscordSRV will not start.");
Expand All @@ -53,14 +53,14 @@ public static boolean checkForUpdates() {

// build is ahead of minimum so that's good

String masterHash = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/Scarsz/DiscordSRV/git/refs/heads/master"), JsonObject.class).getAsJsonObject("object").get("sha").getAsString();
JsonObject masterComparisonResult = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/Scarsz/DiscordSRV/compare/" + masterHash + "..." + buildHash), JsonObject.class);
String masterHash = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/DiscordSRV/DiscordSRV/git/refs/heads/master"), JsonObject.class).getAsJsonObject("object").get("sha").getAsString();
JsonObject masterComparisonResult = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/DiscordSRV/DiscordSRV/compare/" + masterHash + "..." + buildHash), JsonObject.class);
String masterStatus = masterComparisonResult.get("status").getAsString();
switch (masterStatus.toLowerCase()) {
case "ahead":
case "diverged":
String developHash = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/Scarsz/DiscordSRV/git/refs/heads/develop"), JsonObject.class).getAsJsonObject("object").get("sha").getAsString();
JsonObject developComparisonResult = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/Scarsz/DiscordSRV/compare/" + developHash + "..." + buildHash), JsonObject.class);
String developHash = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/DiscordSRV/DiscordSRV/git/refs/heads/develop"), JsonObject.class).getAsJsonObject("object").get("sha").getAsString();
JsonObject developComparisonResult = DiscordSRV.getPlugin().getGson().fromJson(HttpUtil.requestHttp("https://api.github.com/repos/DiscordSRV/DiscordSRV/compare/" + developHash + "..." + buildHash), JsonObject.class);
String developStatus = developComparisonResult.get("status").getAsString();
switch (developStatus.toLowerCase()) {
case "ahead":
Expand Down Expand Up @@ -94,7 +94,7 @@ private static void printUpdateMessage(String explanation) {
DiscordSRV.warning("\n\n" + explanation + " Get the latest build at your favorite distribution center.\n\n" +
"Spigot: https://www.spigotmc.org/resources/discordsrv.18494/\n" +
"Bukkit Dev: http://dev.bukkit.org/bukkit-plugins/discordsrv/\n" +
"Source: https://github.com/Scarsz/DiscordSRV\n");
"Source: https://github.com/DiscordSRV/DiscordSRV\n");
}

}

0 comments on commit d2ef71a

Please sign in to comment.