From 697f3d0265c17afa5c97424470bc438a4b3b254f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 24 Jan 2020 18:04:05 +0100 Subject: [PATCH 1/5] Update pom file --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From f30066308b85fbc8dfd7ccb773984d3a79458325 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 25 Jan 2020 02:05:23 +0100 Subject: [PATCH 2/5] Hey guys --- .../com/bbn/hadder/audio/AudioManager.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) 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); } } From 5dfbc8e71820f2b383c275f50dab4cb6d3d7487e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 25 Jan 2020 02:13:26 +0100 Subject: [PATCH 3/5] Prepare for next JDA release --- .../hadder/commands/moderation/RegionChangeCommand.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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..761b877 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( @@ -96,8 +100,7 @@ public class RegionChangeCommand implements Command { .build()).queue(); 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( From 53a95f78a3e7edc2dd7e09717b048ffe9548a2ee Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 25 Jan 2020 02:15:48 +0100 Subject: [PATCH 4/5] yk --- .../com/bbn/hadder/commands/moderation/RegionChangeCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 761b877..51a9e3d 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java @@ -100,7 +100,7 @@ public class RegionChangeCommand implements Command { .build()).queue(); break; } - + } else e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } else e.getTextChannel().sendMessage( From 1e0da3ab8ae769101a622112cd2560041a7b9e0f Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 26 Jan 2020 11:55:52 +0100 Subject: [PATCH 5/5] oof moment --- .../java/com/bbn/hadder/RethinkServer.java | 18 +++++++++--------- src/main/java/com/bbn/hadder/RethinkUser.java | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) 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()) {