diff --git a/pom.xml b/pom.xml
index 256bfda..ae33d40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
Hadder
Hadder
- 0.1-BETA
+ 1.0.0
Hadder
diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java
index 36af37e..c15c448 100644
--- a/src/main/java/com/bbn/hadder/RethinkServer.java
+++ b/src/main/java/com/bbn/hadder/RethinkServer.java
@@ -24,15 +24,15 @@ public class RethinkServer {
private Rethink rethink;
- private String accept_emote = "";
- private String decline_emote = "";
- private String id;
- private boolean invite_detect = false;
- private String message_id = "";
- private String neededstars = "3";
- private String prefix = "h.";
- private String role_id = "";
- private String starboard = "";
+ String accept_emote = "";
+ String decline_emote = "";
+ String id;
+ boolean invite_detect = false;
+ String message_id = "";
+ String neededstars = "3";
+ String prefix = "h.";
+ String role_id = "";
+ String starboard = "";
public RethinkServer(JSONObject object, Rethink rethink) {
for (Field field : this.getClass().getDeclaredFields()) {
diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java
index 94a7189..26376f5 100644
--- a/src/main/java/com/bbn/hadder/RethinkUser.java
+++ b/src/main/java/com/bbn/hadder/RethinkUser.java
@@ -24,10 +24,10 @@ public class RethinkUser {
private Rethink rethink;
- private String id;
- private String prefix = "h.";
- private String language = "en";
- private String blacklisted = "none";
+ String id;
+ String prefix = "h.";
+ String language = "en";
+ String blacklisted = "none";
public RethinkUser(JSONObject object, Rethink rethink) {
for (Field field : this.getClass().getDeclaredFields()) {
diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java
index 051c479..05ae700 100644
--- a/src/main/java/com/bbn/hadder/audio/AudioManager.java
+++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java
@@ -130,6 +130,8 @@ public class AudioManager {
});
}
+ /*
+ TODO: DJ integration
public boolean isDj(Member member) {
return member.getRoles().stream().anyMatch(r -> r.getName().equals("DJ"));
}
@@ -137,22 +139,18 @@ public class AudioManager {
public boolean isCurrentDj(Member member) {
return getTrackManager(member.getGuild()).getTrackInfo(getPlayer(member.getGuild()).getPlayingTrack()).getAuthor().equals(member);
}
-
+*/
public void forceSkipTrack(CommandEvent event) {
getPlayer(event.getGuild()).stopTrack();
}
- public String getTimestamp(long milis) {
- long seconds = milis / 1000;
- long hours = Math.floorDiv(seconds, 3600);
- seconds = seconds - (hours * 3600);
- long mins = Math.floorDiv(seconds, 60);
- seconds = seconds - (mins * 60);
- return (hours == 0 ? "" : hours + ":") + String.format("%02d", mins) + ":" + String.format("%02d", seconds);
- }
-
- public String getOrNull(String s) {
- return s.isEmpty() ? "N/A" : s;
+ public String getTimestamp(long m) {
+ long s = m / 1000;
+ long hours = Math.floorDiv(s, 3600);
+ s = s - (hours * 3600);
+ long minutes = Math.floorDiv(s, 60);
+ s = s - (minutes * 60);
+ return (hours == 0 ? "" : hours + ":") + String.format("%02d", minutes) + ":" + String.format("%02d", s);
}
}
diff --git a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
index 5ceed72..51a9e3d 100644
--- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
@@ -86,6 +86,10 @@ public class RegionChangeCommand implements Command {
case "us-south":
setRegion(Region.US_SOUTH, "US South", e);
break;
+ /*case "south-korea":
+ setRegion(Region.SOUTH_KOREA, "South Korea", e);
+ break;
+ TODO: Publish when JDA v4.2.0 is released*/
default:
e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage(
@@ -97,7 +101,6 @@ public class RegionChangeCommand implements Command {
break;
}
- //TODO: Maybe South Korea. Check the geo restricted discussion
} else
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} else e.getTextChannel().sendMessage(