From c4c78a96a7f958ced22eb7a6884e6d2fe1dfa4c1 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 26 Dec 2019 23:01:58 +0100 Subject: [PATCH 1/3] Avatar fix --- src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java | 2 +- src/main/resources/Translations/Translations_en.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java index e3c852d..9bb48f9 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/AvatarCommand.java @@ -66,6 +66,6 @@ public class AvatarCommand implements Command { @Override public String usage() { - return "[@User]/[ID]"; + return "user/id"; } } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 660e58c..27fe8d7 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -16,6 +16,7 @@ region = guildid = content = song = +user/id= [@User]/[ID] error = Error none = None -- 2.45.3 From 06e30e9276faa1b384f6b33cac57a05b062343e3 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 26 Dec 2019 23:23:52 +0100 Subject: [PATCH 2/3] Bug fix --- src/main/java/com/bbn/hadder/commands/fun/GifCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java index ecd14d1..760c139 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/GifCommand.java @@ -58,6 +58,6 @@ public class GifCommand implements Command { @Override public String usage() { - return ""; + return "searchterm"; } } -- 2.45.3 From 692a47f11822e50b137329d90fb8b97c09fce8e2 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Thu, 26 Dec 2019 23:27:49 +0100 Subject: [PATCH 3/3] Perm bug fix --- .../java/com/bbn/hadder/commands/moderation/NickCommand.java | 2 +- src/main/java/com/bbn/hadder/core/Perm.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java index df21d5a..6a10aa2 100644 --- a/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java +++ b/src/main/java/com/bbn/hadder/commands/moderation/NickCommand.java @@ -12,7 +12,7 @@ import com.bbn.hadder.utils.MessageEditor; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; -@Perms(Perm.CHANGE_NICKNAME) +@Perms(Perm.MANAGE_NICKNAMES) public class NickCommand implements Command { @Override diff --git a/src/main/java/com/bbn/hadder/core/Perm.java b/src/main/java/com/bbn/hadder/core/Perm.java index 4cd1b7a..1ecb0f4 100644 --- a/src/main/java/com/bbn/hadder/core/Perm.java +++ b/src/main/java/com/bbn/hadder/core/Perm.java @@ -52,10 +52,10 @@ public enum Perm { return event.getMember().hasPermission(Permission.MANAGE_ROLES) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); } }, - CHANGE_NICKNAME { + MANAGE_NICKNAMES { @Override public boolean check(CommandEvent event) { - return event.getMember().hasPermission(Permission.NICKNAME_CHANGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); + return event.getMember().hasPermission(Permission.NICKNAME_MANAGE) || event.getConfig().getOwners().contains(event.getAuthor().getIdLong()); } }, ADMINISTRATOR { -- 2.45.3