greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge pull request #347 from BigBotNetwork/greg-dev

Browse source 
Greg dev
This commit is contained in:
Skidder 2020-01-26 11:57:58 +01:00 • committed by GitHub
commit 97491e3ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -5,7 +5,7 @@
<groupId>Hadder</groupId> <groupId>Hadder</groupId>
<artifactId>Hadder</artifactId> <artifactId>Hadder</artifactId>
<version>0.1-BETA</version> <version>1.0.0</version>
<name>Hadder</name> <name>Hadder</name>

18
src/main/java/com/bbn/hadder/RethinkServer.java
View file

@ -24,15 +24,15 @@ public class RethinkServer {
private Rethink rethink; private Rethink rethink;
private String accept_emote = ""; String accept_emote = "";
private String decline_emote = ""; String decline_emote = "";
private String id; String id;
private boolean invite_detect = false; boolean invite_detect = false;
private String message_id = ""; String message_id = "";
private String neededstars = "3"; String neededstars = "3";
private String prefix = "h."; String prefix = "h.";
private String role_id = ""; String role_id = "";
private String starboard = ""; String starboard = "";
public RethinkServer(JSONObject object, Rethink rethink) { public RethinkServer(JSONObject object, Rethink rethink) {
for (Field field : this.getClass().getDeclaredFields()) { for (Field field : this.getClass().getDeclaredFields()) {

8
src/main/java/com/bbn/hadder/RethinkUser.java
View file

@ -24,10 +24,10 @@ public class RethinkUser {
private Rethink rethink; private Rethink rethink;
private String id; String id;
private String prefix = "h."; String prefix = "h.";
private String language = "en"; String language = "en";
private String blacklisted = "none"; String blacklisted = "none";
public RethinkUser(JSONObject object, Rethink rethink) { public RethinkUser(JSONObject object, Rethink rethink) {
for (Field field : this.getClass().getDeclaredFields()) { for (Field field : this.getClass().getDeclaredFields()) {

22
src/main/java/com/bbn/hadder/audio/AudioManager.java
View file

@ -130,6 +130,8 @@ public class AudioManager {
}); });
} }
/*
TODO: DJ integration
public boolean isDj(Member member) { public boolean isDj(Member member) {
return member.getRoles().stream().anyMatch(r -> r.getName().equals("DJ")); return member.getRoles().stream().anyMatch(r -> r.getName().equals("DJ"));
} }
@ -137,22 +139,18 @@ public class AudioManager {
public boolean isCurrentDj(Member member) { public boolean isCurrentDj(Member member) {
return getTrackManager(member.getGuild()).getTrackInfo(getPlayer(member.getGuild()).getPlayingTrack()).getAuthor().equals(member); return getTrackManager(member.getGuild()).getTrackInfo(getPlayer(member.getGuild()).getPlayingTrack()).getAuthor().equals(member);
} }
*/
public void forceSkipTrack(CommandEvent event) { public void forceSkipTrack(CommandEvent event) {
getPlayer(event.getGuild()).stopTrack(); getPlayer(event.getGuild()).stopTrack();
} }
public String getTimestamp(long milis) { public String getTimestamp(long m) {
long seconds = milis / 1000; long s = m / 1000;
long hours = Math.floorDiv(seconds, 3600); long hours = Math.floorDiv(s, 3600);
seconds = seconds - (hours * 3600); s = s - (hours * 3600);
long mins = Math.floorDiv(seconds, 60); long minutes = Math.floorDiv(s, 60);
seconds = seconds - (mins * 60); s = s - (minutes * 60);
return (hours == 0 ? "" : hours + ":") + String.format("%02d", mins) + ":" + String.format("%02d", seconds); return (hours == 0 ? "" : hours + ":") + String.format("%02d", minutes) + ":" + String.format("%02d", s);
}
public String getOrNull(String s) {
return s.isEmpty() ? "N/A" : s;
} }
} }

5
src/main/java/com/bbn/hadder/commands/moderation/RegionChangeCommand.java
View file

@ -86,6 +86,10 @@ public class RegionChangeCommand implements Command {
case "us-south": case "us-south":
setRegion(Region.US_SOUTH, "US South", e); setRegion(Region.US_SOUTH, "US South", e);
break; break;
/*case "south-korea":
setRegion(Region.SOUTH_KOREA, "South Korea", e);
break;
TODO: Publish when JDA v4.2.0 is released*/
default: default:
e.getTextChannel().sendMessage( e.getTextChannel().sendMessage(
e.getMessageEditor().getMessage( e.getMessageEditor().getMessage(
@ -97,7 +101,6 @@ public class RegionChangeCommand implements Command {
break; break;
} }
//TODO: Maybe South Korea. Check the geo restricted discussion
} else } else
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} else e.getTextChannel().sendMessage( } else e.getTextChannel().sendMessage(