From eee4db201a77c838459206a7a7a4729c81dbbc90 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Thu, 3 May 2018 10:11:32 +0200 Subject: [PATCH 1/6] Add getChannels --- .../java/net/Broken/Commands/GetChannels.java | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/main/java/net/Broken/Commands/GetChannels.java diff --git a/src/main/java/net/Broken/Commands/GetChannels.java b/src/main/java/net/Broken/Commands/GetChannels.java new file mode 100644 index 0000000..bb5e82b --- /dev/null +++ b/src/main/java/net/Broken/Commands/GetChannels.java @@ -0,0 +1,36 @@ +package net.Broken.Commands; + +import net.Broken.Commande; +import net.Broken.Tools.EmbedMessageUtils; +import net.dv8tion.jda.core.EmbedBuilder; +import net.dv8tion.jda.core.entities.TextChannel; +import net.dv8tion.jda.core.events.message.MessageReceivedEvent; + +import java.awt.*; + +public class GetChannels implements Commande{ + @Override + public void action(String[] args, MessageReceivedEvent event) { + event.getGuild().getTextChannels(); + EmbedBuilder eb = new EmbedBuilder().setColor(Color.green); + for(TextChannel channel : event.getGuild().getTextChannels()) + eb.addField(channel.getName(),"ID: " + channel.getId(), false); + + event.getTextChannel().sendMessage(EmbedMessageUtils.buildStandar(eb)).complete(); + } + + @Override + public boolean isPrivateUsable() { + return false; + } + + @Override + public boolean isAdminCmd() { + return true; + } + + @Override + public boolean isNSFW() { + return false; + } +} From 61c0d31dbca219b93b3276c8ad0a0cf68d2c5407 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Thu, 3 May 2018 10:17:40 +0200 Subject: [PATCH 2/6] Correct TYPO --- src/main/java/net/Broken/Commands/Preference.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/Broken/Commands/Preference.java b/src/main/java/net/Broken/Commands/Preference.java index d53345a..18a6bf2 100644 --- a/src/main/java/net/Broken/Commands/Preference.java +++ b/src/main/java/net/Broken/Commands/Preference.java @@ -192,7 +192,7 @@ public class Preference implements Commande { throw new NumberFormatException(); } }catch (NumberFormatException e){ - MessageEmbed msg = EmbedMessageUtils.buildStandar(EmbedMessageUtils.getError("\nRole not found!\n\nUse `//listroles` to get roles id")); + MessageEmbed msg = EmbedMessageUtils.buildStandar(EmbedMessageUtils.getError("\nText channel not found!\n\nUse `//listroles` to get roles id")); Message sended = event.getTextChannel().sendMessage(msg).complete(); new MessageTimeOut(MainBot.messageTimeOut, sended, event.getMessage()).start(); } From 91f35592f43a1d37bf1e944ac7b3736eff799a9d Mon Sep 17 00:00:00 2001 From: Sebastien Date: Thu, 3 May 2018 10:31:21 +0200 Subject: [PATCH 3/6] Remove space from value for id on pref --- src/main/java/net/Broken/Commands/Preference.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/Broken/Commands/Preference.java b/src/main/java/net/Broken/Commands/Preference.java index 18a6bf2..6736a56 100644 --- a/src/main/java/net/Broken/Commands/Preference.java +++ b/src/main/java/net/Broken/Commands/Preference.java @@ -140,6 +140,7 @@ public class Preference implements Commande { break; case "default_role_id": try{ + value = value.replaceAll(" ", ""); Role role = event.getGuild().getRoleById(value); if(role != null){ pref.setDefaultRoleId(role.getId()); @@ -177,6 +178,7 @@ public class Preference implements Commande { break; case "welcome_chanel_id": try{ + value = value.replaceAll(" ", ""); TextChannel chanel = event.getGuild().getTextChannelById(value); if(chanel != null){ pref.setWelcomeChanelID(chanel.getId()); From bb68efc27d123d869aac9095aa9eb2323f6add34 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Thu, 3 May 2018 10:37:31 +0200 Subject: [PATCH 4/6] Remove all space --- src/main/java/net/Broken/Commands/Preference.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/net/Broken/Commands/Preference.java b/src/main/java/net/Broken/Commands/Preference.java index 6736a56..094005c 100644 --- a/src/main/java/net/Broken/Commands/Preference.java +++ b/src/main/java/net/Broken/Commands/Preference.java @@ -108,6 +108,7 @@ public class Preference implements Commande { GuildPreferenceEntity pref = getPreference(event.getGuild()); switch (key){ case "anti_spam": + value = value.replaceAll(" ", ""); if(value.toLowerCase().equals("true") || value.toLowerCase().equals("false")){ boolean result = Boolean.parseBoolean(value); pref.setAntiSpam(result); @@ -125,6 +126,7 @@ public class Preference implements Commande { case "default_role": + value = value.replaceAll(" ", ""); if(value.toLowerCase().equals("true") || value.toLowerCase().equals("false")){ boolean result = Boolean.parseBoolean(value); pref.setDefaultRole(result); @@ -163,6 +165,7 @@ public class Preference implements Commande { break; case "welcome": + value = value.replaceAll(" ", ""); if(value.toLowerCase().equals("true") || value.toLowerCase().equals("false")){ boolean result = Boolean.parseBoolean(value); pref.setWelcome(result); From 909cb80826ec557b403a859b5883f77a89f0b625 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Thu, 3 May 2018 10:51:27 +0200 Subject: [PATCH 5/6] Correct only one guild --- src/main/resources/static/js/navabar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/js/navabar.js b/src/main/resources/static/js/navabar.js index 824c8cc..15e7d7d 100644 --- a/src/main/resources/static/js/navabar.js +++ b/src/main/resources/static/js/navabar.js @@ -174,7 +174,7 @@ function getGuild(){ $('#guild_form').empty(); if(data.length === 1){ - Cookies.set('guild', data.id, { expires: 31 }); + Cookies.set('guild', data[0].id, { expires: 31 }); return; } data.forEach(function(element){ From 535e78ba08eba32e8d5c2796b748597316b4463b Mon Sep 17 00:00:00 2001 From: Sebastien Date: Fri, 4 May 2018 14:40:17 +0200 Subject: [PATCH 6/6] Correct html error --- src/main/resources/static/error/404.html | 97 ++++++++++++++++------- src/main/resources/templates/loading.html | 10 +-- 2 files changed, 68 insertions(+), 39 deletions(-) diff --git a/src/main/resources/static/error/404.html b/src/main/resources/static/error/404.html index c68705d..12b027b 100644 --- a/src/main/resources/static/error/404.html +++ b/src/main/resources/static/error/404.html @@ -10,54 +10,61 @@ - - + + + + + + + + +
  • @@ -93,14 +100,16 @@
    account_box - + +
    security - + +
    @@ -120,6 +129,34 @@
    + + + + + + + + + + diff --git a/src/main/resources/templates/loading.html b/src/main/resources/templates/loading.html index f9d4488..cde78e3 100644 --- a/src/main/resources/templates/loading.html +++ b/src/main/resources/templates/loading.html @@ -23,15 +23,7 @@