Merge pull request #262 from BigBotNetwork/greg-dev

Merged!

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";
     }
 }

src/main/java/com/bbn/hadder/commands/fun/GifCommand.java

@@ -58,6 +58,6 @@ public class GifCommand implements Command {
 
     @Override
     public String usage() {
-        return "<SearchTerm>";
+        return "searchterm";
     }
 }

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

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 {

src/main/resources/Translations/Translations_en.properties

@@ -16,6 +16,7 @@ region = <region>
 guildid = <Guild-ID>
 content = <Message-content>
 song = <Song>
+user/id= [@User]/[ID]
 
 error = Error
 none = None